ticket: 1 Changed according to mistakes
Merge branch 'master' into t3_middleware

Conflicts:
	django_hello_world/person/static/css/main.css
	django_hello_world/person/templates/index.htm