Merge branch 'dev'

diff --cc .gitmodules
index a4852ddf85a1202ad3ca24dad8e6caefa1cc380c,79d0b4db73ac1d86530820af81554db52d4fad02..9a31358b424614e90a877b59addf217438c5c5e2
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,44 -1,38 +1,38 @@@
  [submodule "lib/mezzanine"]
-       path = lib/mezzanine
-       url = https://github.com/yomguy/mezzanine.git
+     path = lib/mezzanine
 -    url = git@github.com:yomguy/mezzanine.git
++    url = https://github.com/yomguy/mezzanine.git
      branch-master = mezzo-master
      branch-dev = mezzo-dev
  [submodule "lib/mezzanine-agenda"]
-       path = lib/mezzanine-agenda
+     path = lib/mezzanine-agenda
 -    url = git@github.com:Ircam-Web/mezzanine-agenda.git
 +    url = https://github.com/Ircam-Web/mezzanine-agenda.git
      branch-master = master
      branch-dev = dev
  [submodule "lib/mezzanine-organization-themes"]
-       path = lib/mezzanine-organization-themes
-       url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
+     path = lib/mezzanine-organization-themes
 -    url = git@github.com:Ircam-Web/mezzanine-organization-themes.git
++    url = https://github.com/Ircam-Web/mezzanine-organization-themes.git
      branch-master = master
      branch-dev = dev
      ignore = dirty
  [submodule "bin"]
-       path = bin
-       url = https://github.com/Ircam-Web/mezzo-bin.git
+     path = bin
 -    url = git@github.com:Ircam-Web/mezzo-bin.git
++    url = https://github.com/Ircam-Web/mezzo-bin.git
      branch-master = master
      branch-dev = master
  [submodule "lib/grappelli-safe"]
-       path = lib/grappelli-safe
-       url = https://github.com/yomguy/grappelli-safe.git
+     path = lib/grappelli-safe
 -    url = git@github.com:yomguy/grappelli-safe.git
++    url = https://github.com/yomguy/grappelli-safe.git
      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
+     path = lib/mezzanine-organization
 -    url = git@github.com:Ircam-Web/mezzanine-organization.git
++    url = https://github.com/Ircam-Web/mezzanine-organization.git
      branch-master = 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
+     path = lib/cartridge
 -    url = git@github.com:Ircam-Web/cartridge.git
 +    url = https://github.com/Ircam-Web/cartridge.git
      branch-master = master
      branch-dev = master

diff --cc lib/grappelli-safe
index 78bbc0d8d62ec6c99da7a21624595b9af6a582ed,78bbc0d8d62ec6c99da7a21624595b9af6a582ed..64188e4182af7b348308dcc03849c21fa1a9542e
--- 1/lib/grappelli-safe
--- 2/lib/grappelli-safe
+++ b/lib/grappelli-safe
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 78bbc0d8d62ec6c99da7a21624595b9af6a582ed
++Subproject commit 64188e4182af7b348308dcc03849c21fa1a9542e

diff --cc lib/mezzanine-agenda
index d84bd0a6eb35d32b4e7c9390178006a9c102973d,b7fad817efbd084ec2eccb4bfc60fd7fba02f2c3..5520a2a1c2d252f4c52dcdea3431a620bca1b626
--- 1/lib/mezzanine-agenda
--- 2/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d84bd0a6eb35d32b4e7c9390178006a9c102973d
 -Subproject commit b7fad817efbd084ec2eccb4bfc60fd7fba02f2c3
++Subproject commit 5520a2a1c2d252f4c52dcdea3431a620bca1b626

diff --cc lib/mezzanine-organization-themes
index 886f421886ebbe4d8046f6963caeb3090a1c2a78,fad74f440d77060d0d6a3a788dc9347c52a8ffda..83dbb378594f2e14586be0782b020e48c0c37557
--- 1/lib/mezzanine-organization-themes
--- 2/lib/mezzanine-organization-themes
+++ b/lib/mezzanine-organization-themes
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 886f421886ebbe4d8046f6963caeb3090a1c2a78
 -Subproject commit fad74f440d77060d0d6a3a788dc9347c52a8ffda
++Subproject commit 83dbb378594f2e14586be0782b020e48c0c37557