pre merge
pre merge
Merge pull request #21 from lrakhman/survey_controller

Survey controller