Merge branch 'dev'

diff --cc .gitmodules
index c8cafad751c0026a2fbdd29ec91f09582c5a07ed,00fe4f4964d80a7a5351ac0110b621fd90f8bf26..72196492d6f7851d5c00390fbabea0211b59058d
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -23,9 -23,9 +23,9 @@@
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
      path = lib/mezzanine-organization
 -    url = git@github.com:Ircam-Web/mezzanine-organization.git
 +    url = https://github.com/Ircam-Web/mezzanine-organization.git
      branch-master = master
-     branch-dev = docker
+     branch-dev = dev
      ignore = dirty
  [submodule "lib/cartridge"]
      path = lib/cartridge