Merge pull request #416 from LearningLocker/develop

Implements phase two of reports.
Bumps the minor for reports phase 2.
Merge branch 'master' into develop