merge
Merge branch 'master' of https://github.com/haxakl/tp2webmiage

Conflicts:
	src/java/panier/modeles/ShoppingCartClient.java