ticket:4 fixes
Merge branch 't4_settings'

Conflicts:
	person/migrations/0001_initial.py
	person/templates/index.html
	person/tests.py
	selenium_tests.py
	static/css/style.css
	templates/base.html
	test_assignment/urls.py
	utils/migrations/0001_initial.py
	utils/tests.py