Merge branch 'hotfix/new_db'

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

* hotfix/staging_user_test:
  user changed back