resolve conficts

diff --cc .gitmodules
index 6201751297dfcbc221dc6e3062b5bde24aad9428,5fa55236a80a36630486415493bdf6f23e7a67a1..8d9623b3cd1285f138e56874dc4c0837f63136b9
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -28,15 -28,9 +28,15 @@@
  [submodule "lib/mezzanine-organization"]
        path = lib/mezzanine-organization
        url = https://github.com/Ircam-Web/mezzanine-organization.git
-     branch-master = mezzo
-     branch-dev = mezzo
+     branch-master = master
+     branch-dev = master
      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
      url = https://github.com/Ircam-Web/cartridge.git

diff --cc app/local_settings.py
index da21d1477feea4c4a25c4200cfe9af57261056f2,5d05c65fd5a0001e20e57922238ac20af02f0ab4..ad6e428e49a98b3f9e5bdcccfbc530a01bdb4a4a
--- 1/app/local_settings.py
--- 2/app/local_settings.py
+++ b/app/local_settings.py
@@@ -87,12 -87,3 +87,13 @@@ FIGGO_API_HEADER_AUTH='Lucca applicatio
  #     ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'),
  #     ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'),
  # ]
 +
 +if DEBUG:
 +    PROTOCOLE = "http://"
 +else:
 +    PROTOCOLE = "https://"
 +
 +HAL_URL_PART_1 = PROTOCOLE + "haltools.archives-ouvertes.fr/Public/afficheRequetePubli.php?labos_exp=%s&affi_exp=%s"
 +HAL_URL_PART_2 = "&CB_auteur=oui&CB_titre=oui&CB_article=oui&langue=Anglais&tri_exp=annee_publi&tri_exp2=typdoc" \
 +                "&tri_exp3=date_publi&ordre_aff=TA&Fen=Aff&css=" + PROTOCOLE + "%s/static/css/index.min.css"
++