Merge remote-tracking branch 'origin/crem' into crem

diff --cc app/settings.py
index 278df98afd62fc5bca6abc1a7fdcd7d736c77530,771cc0567c02aa7675aa8aa056bd100d97c80610..38d4ca0fba0bc1c0c21d45a59e62e9f17e0dac25
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -242,10 -242,10 +242,12 @@@ PAGINATION_SETTINGS = 
      'PAGE_RANGE_DISPLAYED': 10,
      'MARGIN_PAGES_DISPLAYED': 2,
  }
- #DEBUG_TOOLBAR_CONFIG = {
- #    'SHOW_TOOLBAR_CALLBACK': lambda x : True
- #}
 +
+ if DEBUG:
+     DEBUG_TOOLBAR_CONFIG = {
+         'SHOW_TOOLBAR_CALLBACK': lambda x : True
+     }
++
  DEBUG_TOOLBAR_PATCH_SETTINGS = False
  DEBUG_TOOLBAR_PANELS = [
      'debug_toolbar.panels.versions.VersionsPanel',