Merge branch 'qa' into development
fixed trainermetric report
fucking mereged:
Merge branch 'development' into qa

* development:
  fixed trainermetric report