Merge remote-tracking branch 'origin/dev' into crem

diff --cc docker-compose.yml
index 7b82c43ad0909f58a109ec0f2ca64dd412e92627,b064e29694ad29aa8b6bd9a4d2408dda2025098b..5fe482a1d1b061312a095b729170c380beb93caa
--- 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
 +     - /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: