Merge branch 'redesign_answer'

Conflicts:
	app/assets/stylesheets/survey_builder.css.scss
	app/views/surveys/_survey_builder.html.erb