Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
	app/festival/templates/festival/inc/artist_card.html

diff --cc app/festival/templates/festival/inc/artist_card.html
index f485b7f721e1c6ad35ea1bdaf504968c350a383a,468390eba87b74dca3f8e79dacb414897ae4e446..21c3babe5694585ce16f21b1d155b814bd8f3705
--- 1/app/festival/templates/festival/inc/artist_card.html
--- 2/app/festival/templates/festival/inc/artist_card.html
+++ b/app/festival/templates/festival/inc/artist_card.html
@@@ -1,6 -1,4 +1,6 @@@
- <div class="artist__item msry__item">
 +{% load i18n pages_tags mezzanine_tags %}
 +
+ <div class="artist__item {% if not on_home %}msry__item {% endif %}">
      <div class="artist__item__inner">
          <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
              <figure class="artist__item__img">

diff --cc lib/mezzanine-agenda
index 0000000000000000000000000000000000000000,462bf2bf37b7b91b0b5fff6977ca82552051034e..2bda2f5f81f289497baa321e7e607a95b26024aa
mode 000000,160000..160000
--- /dev/null
--- 2/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 462bf2bf37b7b91b0b5fff6977ca82552051034e
++Subproject commit 2bda2f5f81f289497baa321e7e607a95b26024aa