Ajout historique
Ajout historique
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/resources/ezcomp/caddie.xhtml