Complete user profile
Merge branch 'feature-profile' into development

* feature-profile:
  Complete user profile