Merge pull request #9 from lrakhman/survey_controller

Survey controller
not sure
Merge branch 'master' into layout
header is changed.
Merge pull request #10 from lrakhman/layout

Layout
fixed up a bit from that error
Merge branch 'master' into survey_controller