Adding venues to the admin view
Merge branch 'master' of github.com:thisisaurelia/uct-maths

Conflicts:
	uctMaths/competition/__init__.pyc
	uctMaths/competition/admin.pyc
	uctMaths/competition/models.pyc
	uctMaths/uctMaths/__init__.pyc
	uctMaths/uctMaths/settings.pyc
	uctMaths/uctMaths/urls.pyc
	uctMaths/uctMaths/wsgi.pyc