Base version pages
Remove some unused templates
Merge branch 'master' of https://github.com/kchq/CodeDay

Conflicts:
	django_dev/CodeCombat/admin.py
	django_dev/CodeCombat/admin.pyc
	django_dev/CodeCombat/models.pyc
	django_dev/CodeCombat/templatetags/__init__.pyc
	django_dev/CodeCombat/views/__init__.pyc
	django_dev/django_dev/urls.py
Merge branch 'master' of https://github.com/kchq/CodeDay