merge ok
Ajout du moyen de paiement (Final)
Correction de la selection des radioboxs lors du raffraichissement de la
page caisse
Add data for demo
Merge remote-tracking branch 'origin/NewMaster'

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/Application.java
	ProjAppliWeb/src/main/java/m2/project/model/Customer.java
	ProjAppliWeb/src/main/java/m2/project/model/Facture.java
	ProjAppliWeb/src/main/java/m2/project/model/Panier.java
	ProjAppliWeb/src/main/java/m2/project/model/Product.java
	ProjAppliWeb/src/main/resources/templates/facture/facture.html
	ProjAppliWeb/src/main/resources/templates/help.html
	ProjAppliWeb/src/main/resources/templates/product/caisse.html