slogan
Merge pull request #20 from tcb-hr/search

slogan
Large zoom control buttons
Doesn't throw error if chat message doesn't have a location
Merge pull request #21 from tcb-hr/mapZoom

Map zoom
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js