Initial commit of user profiles
Merge branch 'userprofiles'

* userprofiles:
  Initial commit of user profiles