settings
Merge branch 'master' of github.com:emilkjer/django-memorycms