using the options_json field for json options
Merge remote-tracking branch 'origin/master'
fixed a failing test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/SurveyDetail.js