Setting.py
Merge branch 'master' of https://github.com/teamreactive/cubo

Conflicts:
	cubo/settings.py
Conflict solved
Merge branch 'master' of https://github.com/teamreactive/cubo