[Merge] : mezzo/dev

diff --cc .gitmodules
index 8d9623b3cd1285f138e56874dc4c0837f63136b9,59e4004c69ec560dc735ae6f10e9c30bcf5277e3..a2c4504b697580d990c74bd77eb01c87a1f4e73e
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -27,18 -27,12 +27,18 @@@
      ignore = dirty
  [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
-       url = https://github.com/Ircam-Web/mezzanine-organization.git
+       url = git@github.com:Ircam-Web/mezzanine-organization.git
      branch-master = master
-     branch-dev = master
+     branch-dev = dev
      ignore = dirty
 +[submodule "var"]
 +      path = var
 +      url = git+ssh://git@git.forge.ircam.fr/ircam-www-data.git
 +    ignore = dirty
 +      branch-master = master
 +      branch-dev = master
  [submodule "lib/cartridge"]
        path = lib/cartridge
-     url = https://github.com/Ircam-Web/cartridge.git
+     url = git@github.com:Ircam-Web/cartridge.git
      branch-master = master
      branch-dev = master

diff --cc app/settings.py
Simple merge