Merge master
Tests junit
Test CustomerController : not ok
Login
Role rights : not ok
Facture
Merge branch 'master' of https://github.com/lucho9/ProjAppliWeb.git

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/Application.java
Application file deleted ?
Merge branch 'stephane'

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/Application.java
	ProjAppliWeb/src/main/java/m2/project/model/Customer.java
	ProjAppliWeb/src/test/java/m2/project/controller/CustomerControllerTest.java
	ProjAppliWeb/src/test/java/m2/project/service/impl/CustomerServiceImplTest.java
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
Facture employe
Merge remote-tracking branch 'origin/master' into Master2

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/Application.java