Merge Mezzo/dev

diff --cc .gitmodules
index a1c4df7d755a4444526e29333b4128c14db822a1,b1bd4d083d385c98b3eb00c8db40a8434d11e5ab..9eb014018225abe0e08366931cda062963e1b2f8
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,16 -1,19 +1,19 @@@
  [submodule "lib/mezzanine"]
        path = lib/mezzanine
        url = https://github.com/yomguy/mezzanine.git
-       branch = jquery
+     branch-master = master
+     branch-dev = master
  [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
-       url = https://github.com/yomguy/mezzanine-agenda.git
-       branch = master
 -    url = https://github.com/Ircam-Web/mezzanine-agenda.git 
++    url = https://github.com/Ircam-Web/mezzanine-agenda.git
+     branch-master = master
+     branch-dev = master
  [submodule "lib/mezzanine-organization-themes"]
        path = lib/mezzanine-organization-themes
        url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
-       branch = master
-         ignore = dirty
+     branch-master = master
 -    branch-dev = master 
++    branch-dev = master
+     ignore = dirty
  [submodule "bin"]
        path = bin
        url = https://github.com/Ircam-Web/mezzo-bin.git
@@@ -18,12 -22,16 +22,22 @@@
  [submodule "lib/grappelli-safe"]
        path = lib/grappelli-safe
        url = https://github.com/yomguy/grappelli-safe.git
-         branch = dynamic_stacked
-         ignore = dirty
+     branch-master = dynamic_stacked
+     branch-dev = dynamic_stacked
+     ignore = dirty
  [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
 -    url = https://github.com/Ircam-Web/mezzanine-organization.git
 -    branch-master = master
 -    branch-dev = master
 +      url = https://github.com/Ircam-Web/mezzanine-organization.git
++      branch-master = master
++      branch-dev = master
 +[submodule "var"]
 +      path = var
 +      url = git+ssh://git@git.forge.ircam.fr/ircam-www-data.git
-         ignore = dirty
++    ignore = dirty
++      branch-master = master
++      branch-dev = master
+ [submodule "lib/cartridge"]
+       path = lib/cartridge
+     url = https://github.com/Ircam-Web/cartridge.git
+     branch-master = master
+     branch-dev = master