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

diff --cc docker-compose.yml
index 839110037202a40995ed6be8cab30963ffb038f0,47d88e9794e2c5aab0d0ff11ee0c5cb8b98a3dfa..7f1de7cbe712013027549c35e10922006cb727ed
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -84,9 -79,9 +84,9 @@@ worker
  nginx:
    image: nginx
    ports:
 -    - "8000:80"
 +    - "8001:80"
    volumes:
-     - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
+     - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
    volumes_from:
      - data
    links: