Merge branch 'qa' into development
Merge branch 'development' into qa

* development:
  tweaking reports
stupid dlls
merged
fix login css
merged