changed settings file
changed back end
changed models
Merge branch 'master' into williamo

Conflicts:
	uctMaths/competition/admin.pyc
	uctMaths/competition/forms.pyc
	uctMaths/competition/models.pyc
	uctMaths/competition/views.pyc
	uctMaths/uctMaths/settings.pyc