Merge branch 'master' into crem

diff --cc telemeta/models/media.py
index cb64851e59027865ef0a4df5388f0010ea6be0ab,5c272d9262f46b92e30f73d9e6101c20600cf521..1548b4de0de97cfe8cb131722821efe2c1376b1d
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -57,10 -57,11 +57,11 @@@ collection_unpublished_code_regex = 'CN
  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'))
  
  class MediaResource(ModelCore):
      "Base class of all media objects"