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