Conflicts:
	accounts/context_processor.py
	accounts/tests.py