hot fix
Merge branch 'master' of github.com:DigitalResearchCentre/tc

Conflicts:
	community/models.py