settings dev
Merge branch 'master' of github.com:andreesg/django-cms-intk