Commied files to the branch
Merge branch 'integrate_reporting_to_develop' into admin_role_use_cases
Added change assessment name functionality
working on the auditlog
working on the ausitlog
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	hamster_marking_system/hamster/settings.py
	hamster_marking_system/web_interface/views.py
merging
Fixed aggregator changes
Merge branch 'admin_role_use_cases' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	hamster_marking_system/reporting/views.py
finalized the auditlog
Merge remote-tracking branch 'origin/auditLog' into develop
Added graph
Merge branch 'file_importing' into develop