Merge branch 'qa' into production

* qa:
messing with buildforrelease.proj
messing with buildforrelease.proj
messing with buildforrelease.proj
Merge branch 'production' into qa

* production:
  messing with buildforrelease.proj
  messing with buildforrelease.proj
  messing with buildforrelease.proj