face status updates
Merge remote-tracking branch 'origin/ui'
Added Map Icons
menu layout change
map styling
map style
Merge branch 'master' into ui
Merge branch 'ui' of https://github.com/asacarrington/Thomson-Travel into ui

Conflicts:
	Thomson/public/images/icons.png