H2 virés
merge ?
Merge branch 'master' of https://github.com/jbmvl/drupal-musee

Conflicts:
	sites/default/files/styles/teaser_activit_s/public/contempler.jpg
	sites/default/files/styles/teaser_activit_s/public/petitsalchimistes.jpg
	sites/default/files/styles/teaser_big/public/background1.jpg
	sites/default/files/styles/teaser_big/public/background2.jpg
	sites/default/files/styles/teaser_big/public/background3.jpg
	sites/default/files/styles/teaser_big/public/background5.jpg
	sites/default/files/styles/teaser_square/public/background1.jpg
	sites/default/files/styles/teaser_square/public/background5.jpg