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