Merge pull request #11 from lrakhman/survey_controller

Survey controller
navbar
Merge branch 'master' into layout
Merge pull request #12 from lrakhman/layout

Layout
upload profile picture finished, oh so personalized.
Merge branch 'master' into survey_controller