git repair
Merge branch 'client-produit' of
https://github.com/beastsouls/projetweb2014.git into client-produit

Conflicts:
	projetweb2014/src/main/java/projet/caisse/controller/Controlleur.java
	projetweb2014/src/main/java/projet/facture/model/FactureModel.java
	projetweb2014/src/main/resources/templates/caisse.html
	projetweb2014/src/main/resources/templates/facture.html