Merge branch 'master' of https://github.com/Ircam-Web/Mezzo

diff --cc app/settings.py
index 63642e66cf25a4dfa7a8809e2984e35ad7dc864c,ecc45e42c71cf2f32f766ed91a85bb6f2a34bb40..e8be132762051939baa7ac50a63983794012dc00
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -286,9 -286,17 +287,17 @@@ INSTALLED_APPS = 
      'extra_views',
  ]
  
+ CUSTOM_MODULES = False
+ 
+ if CUSTOM_MODULES:
+     INSTALLED_APPS += [
+         "organization.custom",
+     ]
+ 
+ 
  
  HOST_THEMES = [
 -    ('example.com', 'organization_themes.ircam-www-theme'),
 +    ('example.com', 'organization_themes.forumnet-theme'),
  ]
  
  BOWER_COMPONENTS_ROOT = '/srv/bower/'