Merge branch 'master' into crem

diff --cc telemeta/models/media.py
index 32b532ce2e566def0a6ef62385db93435fa7adc4,480247ecd63239c968491f6c49623f09e66222d1..499eadb798c1c106a458ee5664a1dc107cc31826
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -49,12 -49,11 +49,13 @@@ from telemeta.models.query import 
  from telemeta.models.instrument import *
  from telemeta.models.enum import *
  from telemeta.models.language import *
+ from telemeta.models.format import *
  from django.db import models
  
 -collection_published_code_regex   = '[A-Za-z0-9._-]*'
 -collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
 +
 +# 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_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)