fix report charts
Merge branch 'develop' into feature/report

* develop:
  fix report charts