fixed merge error
Merge branch 'master' into survey_page
errors fixed
started profile page.
Merge branch 'master' into survey_page
Merge pull request #8 from lrakhman/survey_page

Survey page