Merge branch 'qa' into development
stupid dlls
merged
fixed trainer metric report
fix login css
merged
fixed stupid ugly error in the addusertoviewmodel
merged
fixed reporting issue 401
merged
Merge branch 'development' into qa
forgot the enumeration
Merge branch 'qa' into development
fixed trainermetric report
fucking mereged:
Merge branch 'development' into qa

* development:
  fixed trainermetric report
reporting stuff
reporting
merged
Merge branch 'development' into qa