Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#27863_explo_mettre_en_surbrillance_les_mots_recherches

Conflicts:
	application/modules/opac/controllers/RechercheController.php
	library/Class/MoteurRecherche.php
	library/Class/MoteurRecherche/Result.php
	library/ZendAfi/View/Helper/ListeNotices.php
	library/ZendAfi/View/Helper/Notice/Vignette.php