commit
Merge branch 'master' of https://github.com/clementdubois/bookstore2.git

Conflicts:
	projetJEEM2/WebContent/frontOffice/top.xhtml
Merge branch 'master' of https://github.com/clementdubois/bookstore2.git

Conflicts:
	projetJEEM2/WebContent/frontOffice/top.xhtml
merge - intégration menu connexion top
Merge branch 'master' of https://github.com/clementdubois/bookstore2.git

Conflicts:
	projetJEEM2/WebContent/frontOffice/books/index.xhtml
	projetJEEM2/WebContent/frontOffice/panier/apercu.xhtml
	projetJEEM2/WebContent/frontOffice/top.xhtml
Ajout de la fonction de recherche
Merge branch 'master' of https://github.com/clementdubois/bookstore2.git

Conflicts:
	projetJEEM2/WebContent/frontOffice/books/index.xhtml
	projetJEEM2/WebContent/frontOffice/login.xhtml
	projetJEEM2/src/controller/frontOffice/ClientController.java
	projetJEEM2/src/entities/Book.java
	projetJEEM2/src/resources/strings_fr_FR.properties