Merge branch 'master' into dev

diff --cc .gitmodules
index 10012c84131519fb281692658624cd83e5fb1814,b73c3b00561af8efdee00cd6f6927dd1c7e0afe9..0c39339d60089aa32688c344847538e68689d88e
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -23,6 -23,10 +23,7 @@@
  [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
        url = https://github.com/Ircam-Web/mezzanine-organization.git
 -[submodule "var"]
 -      path = var
 -      url = git+ssh://git@git.forge.ircam.fr/vertigo-data.git
+       branch = vertigo
  [submodule "lib/cartridge"]
        path = lib/cartridge
        url = https://github.com/yomguy/cartridge.git