mvp to edit surveys
solved merge conflict in survey controller
Merge pull request #9 from leejart/edit_survey

Edit survey
resolving merge conflict -- Survey controller