add new_survey field parsing and save to db
fix merge in survey_controller
fix merge conflict