Merge branch 'development' into qa

* development:
  fixed trainermetric report
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'qa' of github.com:reharik/MethodFitness into qa
getting msbuild in shape
getting msbuild in shape
Merge branch 'qa' into development