NOJIRA Reporting updates
Merge branch 'latest-changes-merged-with-master-2' of https://github.com/hart404/newmscwebsite.git into latest-changes-merged-with-master-2