don't pass leave CONF in settings
Merge branch 'master' of git@github.com:podshumok/yadjpks.git

Conflicts:
	yadjpks/urls.py