Merge branch 'hotfix-4.9.9'
Added failing test
Refactored response form to rely less on AnswerSet
Updated specs to match new answer handling
Fixed location picker
Fixed choice bug
Merge branch 'hotfix-v4.9.10' into develop

Conflicts:
	app/views/responses/_answer_set_editable.html.erb
	app/views/responses/_answer_set_read_only.html.erb
Fixed failing tests