Merge branch 'master' into ui
fonts and images
Merge branch 'ui' of https://github.com/asacarrington/Thomson-Travel into ui

Conflicts:
	Thomson/public/images/icons.png
add destination
add destination
Merge branch 'ui'
ui updates for add destiantion