am 4b23c891: am d6ccc719: Add websites to quick contact, and make sure the map icon and the website icon appear at the end of the list.

Merge commit '4b23c8917210aff4373bf98f40fafdccb0b4ba46'

* commit '4b23c8917210aff4373bf98f40fafdccb0b4ba46':
  Add websites to quick contact, and make sure the map icon and the website icon appear at the end of the list.