Added search box
Merge branches 'master' and 'master' of https://github.com/hacktm/Smart-City-Projects-NewHaircut

Conflicts:
	public/media/css/mobile/main.css