Merge branch...

Merge branch 'hotline#122292_gpsea_p3_magasin_de_themes_choisir_affichage_par_defaut_resultat_de_recherche' of git.afi-sa.net:afi/opacce into hotline#122292_gpsea_p3_magasin_de_themes_choisir_affichage_par_defaut_resultat_de_recherche

# Conflicts:
#	tests/scenarios/Templates/TemplatesWidgetTest.php