use the QA database for QA
Merge branch 'develop'

* develop:
  use the QA database for QA