ticket:4 fixed tests.py
ticket:4 updated tests; added 404.html
ticket:3 fixed tests and views
Merge branch 't3_custom_middelware'

Conflicts:
	django_hello_world/hello/tests.py
Merge branch 't4_context_processor'

Conflicts:
	django_hello_world/hello/tests.py