dunno
Merge branch 'master' into test_branch
Merge pull request #20 from lrakhman/survey_page

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

Survey controller
stats link
fixing merge errors
Merge pull request #22 from lrakhman/test_branch

Test branch
css stuff done
fixed errors