fixing merge conflict
updated controllers and models for user profile
fixed merge conflicts
Merge pull request #54 from bobolinks-2014/controller

Controller