Searchview in map
Merge branch 'jl'

Conflicts:
	client/app/scripts/routes/app_router.js
	client/app/styles/_global.scss