Merge branch 'development' into qa

* development:
  fixed buildforrelease.proj
  working on reports
Merge branch 'development' into qa
forgot the enumeration
Merge branch 'qa' into development