Merge remote-tracking branch 'origin/stats_assessmentReport' into develop

Conflicts:

	hamster_marking_system/web_interface/templates/web_interface/testing.htm