Merge remote-tracking branch 'aquameta/feature/82_Misaligned_radios_in_map_overlay' into feature/82_Misaligned_radios_in_map_overlay

Conflicts:
	server/static/survey/assets/js/controllers/SurveyDetail.js
Merge branch 'feature/82_Misaligned_radios_in_map_overlay'