Merge branch 'master' into crem

Conflicts:
	telemeta/models/media.py

diff --cc telemeta/models/media.py
index 0fa544b213bd3305cd06238d53aba005b78dc49c,f641e361dd3425bc2d9ece46bf85a3fba386cc03..5788bde048efa89fe45b2476aa8b902776db9ff4
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -50,14 -50,14 +50,13 @@@ from telemeta.models.instrument import 
  from telemeta.models.enum import *
  from django.db.models.fields import URLField
  
-         
 -
 -collection_published_code_regex   = '[A-Za-z0-9._-]*'
 -collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
 +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_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)
  
 -item_published_code_regex    = '[A-Za-z0-9._-]*'
 -item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
 +item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}'
 +item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
  item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
  
  PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))