Merge branch 'crem2' into diadems

diff --cc telemeta/models/media.py
index 3e2b1942cfe4a4ddd5acc25e21804e91efadb609,2a7e27ca48b1802e73b35d48a344826138e0a6f4..18f5d30fec4d91ab3d8588a93365ce7b93e62169
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -52,10 -52,12 +52,11 @@@ from telemeta.models.language import 
  from telemeta.models.format import *
  from telemeta.util.kdenlive.session import *
  from django.db import models
+ from django.conf import settings
  
  
 -# Special code regex of collections for the branch
 -collection_published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}'
 -collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}'
 +collection_published_code_regex   = '[A-Za-z0-9._-]*'
 +collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
  collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)
  

diff --cc telemeta/views/item.py
Simple merge