Commit avant récupération correction bug template.xhtml
Merge branch 'master' of https://github.com/clementdubois/bookstore2.git

Conflicts:
	projetJEEM2/WebContent/frontOffice/login.xhtml