update
CSS update
Merge branch 'master' of https://github.com/heyaugust/localfriends

Conflicts:
	views/local/Notification.html
	views/tourist/Search.html
	views/tourist/TouristHome.html
	views/tourist/friendsresult.html
	views/tourist/messages.html