Merge branch 'dev' into test

diff --cc .gitmodules
Simple merge

diff --cc docker-compose.yml
index d881b8691f7d6c7a91881aafb381e3bb5a9baef7,b7cc10742efd5bee94873006e58c433081a3f105..b18221b897bd8c29dc5fa6c9025ce9c9b55db782
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -58,8 -60,4 +60,4 @@@ app
      links:
          - db
      environment:
 -        - DEBUG=False
 +        - DEBUG=False
- 
- nginx:
-     image: nginx
-