Facture
Merge branch 'master' of https://github.com/lucho9/ProjAppliWeb.git

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