upload profile picture finished, oh so personalized.
Merge branch 'master' into survey_controller
Merge pull request #13 from lrakhman/survey_controller

Survey controller