updating reports for admins. not finished
Merge branch 'functionality' into version2.1