Merge branch 'master' into crem

diff --cc app/settings.py
index 848fdc6e85573eb0b2fdfc7cb8ebfa34787b18dd,62e73c64f6cc078335eafe1c69b65cbebfad76d5..7aafbb8cf5974507f8f966c62a188c3a209f65c5
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -211,10 -209,11 +210,11 @@@ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp
  TELEMETA_PUBLIC_ACCESS_PERIOD = 51
  
  TELEMETA_STRICT_CODE = False
 -COLLECTION_PUBLISHED_CODE_REGEX = '[A-Za-z0-9._-]*'
 -COLLECTION_UNPUBLISHED_CODE_REGEX = '[A-Za-z0-9._-]*'
 -ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + ''
 -ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + ''
 +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}'
 +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}'
+ RESOURCE_CODE_REGEX = '[A-Za-z0-9._-]*'
  
  AUTH_PROFILE_MODULE = 'telemeta.userprofile'
  SESSION_EXPIRE_AT_BROWSER_CLOSE = False

diff --cc docker-compose.yml
index 7b82c43ad0909f58a109ec0f2ca64dd412e92627,9fb0d7fd539e3aa6da6ad0d8a1223bf684e6ef3a..89c758234df4453b773856ab7b4b04581c32243e
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -25,10 -25,12 +25,12 @@@
  data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/backup/:/srv/backup
 -     - ./data/static:/srv/static
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
-      - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
-      - /srv/bower
++     - ./data/static/:/srv/static
+      - ./data/bower:/srv/bower
+      - ./data/log/nginx:/var/log/nginx
+      - ./data/log/uwsgi:/var/log/uwsgi
    command: "true"
  
  db: