ticket:4. Tests and context_processor modified according to comments
Merge branch 'master' into t4_template_context_processor

Conflicts:
	my_info/add_settings/context_processor.py
	my_info/add_settings/tests.py