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
adding leaflet images
merge
default heroku setting
debugging
updating allowed hosts
removing comma from urls
update syntax for url
update syntax for url
update statics
adding locations and locationanswers on answer save
updating string for location
gave the activity selection modal its own controller to allow for a multi-pane approach without bugginess
adding migration
showing summary stats for locations