Conflicts:
	application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
	library/Class/CriteresRecherche.php
	library/Class/Notice.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

git-svn-id: http://afi-forge.afi-sa.fr/svn/opacce/trunk@1718 e3cc70dd-a52f-4065-8a26-0e09943c8c5c