toggling scoring options
Merge branch 'SurveyTuesday' of https://github.com/appiphony/Phillips into SurveyTuesday

Conflicts:
	survey-edit.html
toggling risk and number fields.