Added Username column to users
Merge branch 'master' into feature/search

* master:
  Added Username column to users