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

Conflicts:
	docker-compose.yml

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

diff --cc app/sandbox/tm-docker-compose.env
index 0719e665023418c38e4b77731b8addede99ac7e7,465d6beb4bed37ee63ca51e043996469cda2acd2..7059bd06039031fd5a7922143818d66afa7a6cdf
--- 1/app/sandbox/tm-docker-compose.env
--- 2/app/sandbox/tm-docker-compose.env
+++ b/app/sandbox/tm-docker-compose.env
@@@ -8,7 -8,7 +8,7 @@@ MYSQL_PASSWORD=iuvIlkyisFit
  
  # -- DJANGO
  
--DEBUG=True
++DEBUG=False
  
  SECRET_KEY=ghv8us2587n97dq&w$c((o5rj_$-9#d-8j#57y_a9og8wux1h7
  

diff --cc docker-compose.yml
index 389f5977a6975652e8c4ecf14710b6e96ed636c5,0cc1d6c978fed86c0ce1209c30e0aa720cc6383c..955e317c87c4d59ab095cadbf039e6dd337eeac0
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -25,9 -25,10 +25,10 @@@
  data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/backup/:/srv/backup
 -     - /srv/static
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
 +     - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
+      - /srv/bower
    command: "true"
  
  db:

diff --cc telemeta/pages
index f8324093174d077b674ac2c52eb0db6eaf815ab5,f8324093174d077b674ac2c52eb0db6eaf815ab5..4fcb6022f8a1cf0780fc526737e84b8e690c1f88
--- 1/telemeta/pages
--- 2/telemeta/pages
+++ b/telemeta/pages
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5
++Subproject commit 4fcb6022f8a1cf0780fc526737e84b8e690c1f88