Adds case for new question type
Merge branch 'master' of github.com:ASCTech/Scarlet

Conflicts:
	app/models/carmen_survey.rb