settings
settings
Merge branch 'master' of github.com:andreesg/django-cms-intk
Merge branch 'master' of github.com:andreesg/django-cms-intk
Merge branch 'master' of github.com:andreesg/django-cms-intk
updated requirements
new settings
fixed conflicts