Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev

diff --cc .gitmodules
index d56ba2c583d6a949b42964889788690fac1b7640,0a380ea2eaa2bea6ce18c43a446543b0d7fbd5d6..43e29d5fef3f36bb7dd8e3b9257179bc1f4697ef
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,18 -1,18 +1,18 @@@
  [submodule "lib/mezzanine"]
        path = lib/mezzanine
        url = https://github.com/yomguy/mezzanine.git
-     branch-master = master
-     branch-dev = master
+     branch-master = mezzo
+     branch-dev = mezzo
  [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
--    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 = master
--    branch-dev = master 
++    branch-dev = master
      ignore = dirty
  [submodule "bin"]
        path = bin
@@@ -26,15 -27,9 +26,10 @@@
      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 = vertigo
++    branch-master = vertigo-master
 +    branch-dev = vertigo-dev
 +    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
  [submodule "lib/cartridge"]
        path = lib/cartridge
      url = https://github.com/Ircam-Web/cartridge.git

diff --cc app/settings.py
Simple merge

diff --cc lib/mezzanine-organization
index 8c5ad697698500906e05d7ce7c793ff70d6cbb5b,7cb33f555fe436d464f961f486d83b448de7a7f4..687397829e9426f7267b306190f256792c5e1231
--- 1/lib/mezzanine-organization
--- 2/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b
 -Subproject commit 7cb33f555fe436d464f961f486d83b448de7a7f4
++Subproject commit 687397829e9426f7267b306190f256792c5e1231