trainermetric fix
more report fixes
Merge branch 'development' into qa