Merge remote-tracking branch 'origin/master' into l-autre-radio

diff --cc panikweb/settings.py
index 7ccb32969a9c8a9014dd48793bfb28cb24ef38a7,66c43c0d94c09dea84d5b2a19cd32b2e1e30885a..3cbd9f644d9d399450c8f10ad8a28d8b18f811c4
--- 1/panikweb/settings.py
--- 2/panikweb/settings.py
+++ b/panikweb/settings.py
@@@ -247,13 -252,11 +247,14 @@@ WEBSITE_BASE_URL = 'http://www.radiopan
  COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
  COMBO_WELCOME_PAGE_PATH = None
  
- try:
-     from .local_settings import *
- except ImportError as e:
-     pass
 +AUTH_USER_MODEL = 'aa.User'
 +THUMBNAIL_PRESERVE_FORMAT = True
 +
+ local_settings_file = os.environ.get(
+     'PANIKWEB_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')
+ )
+ if os.path.exists(local_settings_file):
+     exec(open(local_settings_file).read())
  
  if DEBUG and DEBUG_TOOLBAR:
      MIDDLEWARE_CLASSES += (