commit by Ting
Merge branch 'dev'

Conflicts:
	basePages/templates/basePages/home.html
	html5test/settings.py
	templates/base.html

fixed conflicts
Fixed some more conflicts