working on reports
Merge branch 'development' into qa

* development:
  working on reports