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

Conflicts:
	docker-compose.yml

diff --cc app/sandbox/settings.py
Simple merge

diff --cc docker-compose.yml
index 69714788257ed6f7d2b677ab9dd6d48ebe2b6311,623f5088b5e3eb68e4e74ef1afdee7606828c2ed..389f5977a6975652e8c4ecf14710b6e96ed636c5
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -22,12 -22,12 +22,12 @@@
  # Thomas Fillon <thomas@parisson.com>
  
  
- media:
+ data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/static/:/srv/static
 -     - ./data/backup/:/srv/backup
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
 +     - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
    command: "true"
  
  db: