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

diff --cc docker-compose.yml
index 85b1fa68b2b5e6c15af12af55ca00495d3ded795,b6e6909c22f97cff69d92b231e958c7541bec657..5d80081227dbd4a55cc4c1681c370d7109cefec3
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -79,20 -80,12 +80,11 @@@ worker
  nginx:
    image: nginx
    ports:
 -    - "8000:80"
 +    - "8004: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:
      - app
-     - phpmyadmin
  
- phpmyadmin:
-     image: nazarpc/phpmyadmin
-     ports:
-       - "1238:80"
-     links:
-       - db:mysql
-     environment:
-       - ABSOLUTE_URI=http://localhost:8000/phpmyadmin/
 -