FUCK GIT AGAIN
FUCK FUCK FUCK
Merge branch 'master' of https://github.com/DParat/PW2A

Conflicts:
	.target/controllers/Application$Login.class
	.target/controllers/Application.class
	.target/controllers/EnregistrementInscrit$Inscription.class
	.target/controllers/EnregistrementInscrit.class
	.target/controllers/GestionDemandeDevis.class
	.target/models/DemandeDevis.class
	.target/models/ModelsTest.class
	.target/models/Prestation.class