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

diff --cc .gitmodules
index 0c39339d60089aa32688c344847538e68689d88e,b1bd4d083d385c98b3eb00c8db40a8434d11e5ab..d56ba2c583d6a949b42964889788690fac1b7640
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -18,12 -22,16 +22,21 @@@
  [submodule "lib/grappelli-safe"]
        path = lib/grappelli-safe
        url = https://github.com/yomguy/grappelli-safe.git
 -    branch-master = dynamic_stacked
 -    branch-dev = dynamic_stacked
 +    branch = dynamic_stacked
 +    ignore = dirty
 +[submodule "lib/mezzanine-organization"]
 +      path = lib/mezzanine-organization
 +      url = https://github.com/Ircam-Web/mezzanine-organization.git
-       branch = vertigo
++    branch-master = vertigo
++    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/yomguy/cartridge.git
+     url = https://github.com/Ircam-Web/cartridge.git
+     branch-master = master
+     branch-dev = master

diff --cc app/settings.py
Simple merge

diff --cc lib/mezzanine-organization
index 7e338c8c92db22c71694cf3a5e05c3a720e11dbe,0dc91551ecadc3b12d5502dcbb16fda0e15bb636..8c5ad697698500906e05d7ce7c793ff70d6cbb5b
--- 1/lib/mezzanine-organization
--- 2/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7e338c8c92db22c71694cf3a5e05c3a720e11dbe
 -Subproject commit 0dc91551ecadc3b12d5502dcbb16fda0e15bb636
++Subproject commit 8c5ad697698500906e05d7ce7c793ff70d6cbb5b