Merge branch 'dev' into docker

diff --cc app/bin/app.sh
Simple merge

diff --cc app/settings.py
Simple merge

diff --cc docker-compose.yml
index 56d90ee054b59b7775d18886bc55a6815c8eafea,3b6940275c310f6592dbed2bfbe2b5882ba71426..81f776b6c5e37b71799b94f7e9fcfadb51a7b031
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -18,52 -18,46 +18,52 @@@
  # Authors:
  # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
  
 -# version 1
 -
 -var:
 -    image: debian:jessie
 -    volumes:
 -        - ./var/media:/srv/media
 -        - ./var/backup:/srv/backup
 -        - ./var/static:/srv/static
 -        - ./var/log/uwsgi:/var/log/uwsgi
 -        - ./var/log/nginx:/var/log/nginx
 -        - ./var/log/app:/var/log/app
 -        - ./var/log/cron:/var/log/cron
 -        - ./bin:/srv/bin
 -        - ./doc:/srv/doc
 -        - /srv/bower
 -    command: "true"
 -
 -db:
 -    image: postgres:9.5
 -    volumes_from:
 -        - var
 -    volumes:
 -        - ./var/lib/postgresql/data:/var/lib/postgresql/data
 -    environment:
 -        - POSTGRES_PASSWORD=noodFof2Kna
 -
 -app:
 -    image: ircamweb/mezzo
 -    command: /bin/sh bin/app.sh --runserver
 -    volumes:
 -        - ./app:/srv/app
 -        - ./lib:/srv/lib
 -        - .git:/srv/.git
 -    volumes_from:
 -        - var
 -    expose:
 -        - "8000"
 -    ports:
 -        - "9000:8000"
 -    links:
 -        - db
 -    environment:
 -        - DEBUG=False
 +version: '2'
 +services:
 +    var:
 +        image: debian:jessie
 +        volumes:
 +            - ./var/media:/srv/media
 +            - ./var/backup:/srv/backup
 +            - ./var/static:/srv/static
 +            - ./var/log/uwsgi:/var/log/uwsgi
 +            - ./var/log/nginx:/var/log/nginx
 +            - ./var/log/app:/var/log/app
 +            - ./var/log/cron:/var/log/cron
 +            - ./bin:/srv/bin
 +            - ./doc:/srv/doc
 +            - /srv/bower
 +        command: "true"
 +    db:
 +        image: postgres:9.5
 +        volumes:
 +            - ./var/lib/postgresql/data:/var/lib/postgresql/data
 +        env_file:
 +            - 'env/prod.env'
 +
 +    app:
 +        image: ircamweb/mezzo:latest-dev
 +        command: /bin/sh bin/app.sh --runserver
 +        volumes:
 +            - ./app:/srv/app
 +            - ./lib:/srv/lib
 +            - .git:/srv/.git
 +        volumes_from:
 +            - var
 +        expose:
 +            - "8000"
 +        ports:
-             - "9001:8000" 
++            - "9001:8000"
 +        depends_on:
 +            - var
 +            - db
 +        env_file:
 +            - 'env/prod.env'
 +
 +    nginx:
 +        image: nginx
 +
 +volumes:
 +    var:
 +    app:
 +    db: