Merge branch 'dev' into crem2

Conflicts:
	telemeta/models/media.py

diff --cc example/sandbox/settings.py
index fe913c795593bc646821032e558aa41809910c17,ddaf6e0aa3ef69394f145ab0127f6ec8d500f276..f50a60fc602a6728648a2a7ee57bf0672c7ad877
--- 1/example/sandbox/settings.py
--- 2/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@@ -161,5 -162,3 +162,5 @@@ LOGIN_REDIRECT_URL = reverse_lazy('tele
  
  EMAIL_HOST = 'localhost'
  DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
- FILE_UPLOAD_TEMP_DIR = '/tmp'
 +
++FILE_UPLOAD_TEMP_DIR = '/tmp'

diff --cc telemeta/models/media.py
index fa19564517e85fee15d0b5e9eab09c09701990b8,811d60beb1d4e87f56f977b874661188f71a63cb..9cc9aa621e15c56aefb2f1c5142249632025b82b
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -216,10 -209,9 +215,10 @@@ class MediaCollection(MediaResource)
      publisher_serial      = CharField(_('publisher serial number'))
      booklet_author        = CharField(_('author of published notice'))
      external_references   = TextField(_('bibliographic references'))
-     doctype_code          = IntegerField(_('document type'))
-     public_access         = CharField(_('access status'), choices=PUBLIC_ACCESS_CHOICES,
+     doctype_code          = IntegerField(_('document type'), null=True, blank=True)
+     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
                                        max_length=16, default="metadata")
 +    auto_period_access    = BooleanField(_('automatic access after a rolling period'), default=True)
      legal_rights          = WeakForeignKey('LegalRight', related_name="collections",
                                             verbose_name=_('legal rights'))
  

diff --cc telemeta/templates/telemeta/collection_detail.html
Simple merge

diff --cc telemeta/urls.py
Simple merge

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