Fixing reports controller.
Merge branch 'dashboard' into develop