Merge branch 'master' into aureplop/fix_cache

cof/settings_dev.py

@@ -47,6 +47,7 @@ INSTALLED_APPS = (
     'channels',
     'widget_tweaks',
     'custommail',
+    'djconfig',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -60,6 +61,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
+    'djconfig.middleware.DjConfigMiddleware',
 )
 
 ROOT_URLCONF = 'cof.urls'
@@ -78,8 +80,10 @@ TEMPLATES = [
                 'django.core.context_processors.i18n',
                 'django.core.context_processors.media',
                 'django.core.context_processors.static',
+                'djconfig.context_processors.config',
                 'gestioncof.shared.context_processor',
                 'kfet.context_processors.auth',
+                'kfet.context_processors.config',
             ],
         },
     },