Add TEMPLATE_CONTEXT_PROCESSORS settings [#2]
Merge remote-tracking branch 'hoatle/enhance_2_add_template_context_processors_settings' into develop
Improve settings mechanism: refactor requirements/*, introduce settings/project and urls/project for specific project settings [#4]
Merge remote-tracking branch 'hoatle/enhance_4_improve_settings_mechanism' into develop
Improve settings mechanism: Introduce requirements/project settings [#4]
Merge remote-tracking branch 'hoatle/enhance_4_improve_settings_mechanism' into develop
Merge remote-tracking branch 'teracy/master'

Conflicts:
	settings/dev.py