added a zoom alert dialog – towards #144
adjusted placement of edit link (visible only when authenticated)
added popup after zoomto control is closed – towards #144
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/static/survey/scripts/controllers/SurveyDetail.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/static/survey/scripts/controllers/SurveyDetail.js
in progress of putting activity selection dialog into its own controller
gave the activity selection modal its own controller to allow for a multi-pane approach without bugginess
towards #144 – step-by-step guidance for add location
towards #144
towards #144 - zoomto dialog is now multi paned
rearanging map UI - towards #145
Merge branch 'guided-map'
Merge remote-tracking branch 'origin/master'