Merge branch 'dev'

diff --cc .gitmodules
index 7e3129ea8ac0d8b73a89e94fbebe8d4f130e0580,53cf1ea186257f366e734e2df4599eb697a3342d..dfb269519f7c30891e7e2912c128c0261567fd0b
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -23,9 -23,9 +23,9 @@@
      ignore = dirty
  [submodule "lib/grappelli-safe"]
      path = lib/grappelli-safe
 -    url = git@github.com:Ircam-Web/grappelli-safe.git
 +    url = https://github.com/Ircam-Web/grappelli-safe.git
      branch-master = dynamic_stacked
-     branch-dev = dynamic_stacked
+     branch-dev = dynamic_stacked-dev
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
      path = lib/mezzanine-organization

diff --cc docker-compose.yml
Simple merge