Merge pull request #248 from timschofield/develop

Develop
Merge pull request #249 from timschofield/develop

Develop
Merge pull request #250 from timschofield/develop

Remove unnecessary code from dashboard reports
Merge pull request #251 from timschofield/develop

Develop
Merge pull request #2 from KwaMoja/develop

Develop