minor changes
Merge branch 'develop' of https://github.com/fluffels/hamster into develop

Conflicts:
	hamster_marking_system/business_logic/models.py