Map popups
Merge branch 'jl'

Conflicts:
	client/app/scripts/views/mapView.js