confict test blablabla
Merge branch 'master' of https://github.com/leonbattista/arkiwidjango

Conflicts:
	arkiwi/settings.py