Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/paiement.xhtml
Merge origin/sprint1.5 into sprint1.5
Liens rapides pour le caddie dans moncompte
Merge origin/sprint1.5 into sprint1.5