Update settings.py
Update views.py
Merge branch 'master' of https://github.com/davechina/simpleuat

Conflicts:
	mytest/settings.py