Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
	app/bin/app.sh
	docker-compose.yml
	var

diff --cc .gitignore
index 45b65c2e2c166bdce9a997784a0be05e873ecb97,45b65c2e2c166bdce9a997784a0be05e873ecb97..93312a9cd173224d76e13ce3fa17dc047a24d6e1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,6 +15,7 @@@ develop-egg
  .thumbnails
  .tmp
  *.lock
++var
  
  # Installer logs
  pip-log.txt

diff --cc app/local_settings.py
Simple merge