usernames added to user
username complete
Merge branch 'master' into add-usernames-to-users
resolve conflicts