marco survey now uses east coast screenshot for mapping example – #131
fixed #129 – modal question on map is cut off
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/static/survey/survey-pages/marco/activity-locations-intro.html