ticket:4 added tests
ticket:4 added context_processors.py; updated settings.py
ticket:4 added context_processors.py; updated settings.py
Merge branch 't4_context_processor' of https://github.com/wlame/django-cc-project into t4_context_processor
Merge branch 't4_context_processor'

Conflicts:
	django_hello_world/hello/templates/base.html