Merge branch 'hotfix/staging_user_test'

* hotfix/staging_user_test:
  user changed back
changed staging branch
Merge branch 'hotfix/staging_branch' into develop

* hotfix/staging_branch:
  changed staging branch