Merge pull request #48 from bobolinks-2014/controller

fixed controller
fixing merge conflict
updated controllers and models for user profile