Merge

Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

@@ -109,7 +109,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
       question.update_attributes(title: titles[index])
     end
     
-    @survey.survey_answers.destroy
+    @survey_answers.destroy
     
     # End of speadsheet
     @end_row = @spreadsheet.count
@@ -117,6 +117,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
     # Modify multiline options if changed
     @survey_questions.each_with_index do |question, index|
       case question.type
+
       when ::SurveyQuestion::Radio, ::SurveyQuestion::Select
         ((question.survey_question_options.count + 2)..@end_row).each do |row|   
             @answer_model = @survey.survey_answers.new