Merge branch 'master' into t5_auth_update_form

Conflicts:
	django_hello_world/hello/templates/hello/home.html
	django_hello_world/hello/urls.py
	django_hello_world/urls.py