Split controllers
Merge branch 'master' of https://github.com/nairys/survey_gorilla