Modified surveycontroller so that it can modify surveys.
Merge remote-tracking branch 'origin/master'