user profile added
Merge origin/master
User controller added