added user profile
Merge branch 'master' into userprofile
Added user profiles