Add username and token to User.
Merge branch 'master' into add-s3-to-user

* master:
  Add username and token to User.