Begin MainPanel
Merge branch 'master' of https://github.com/H4305/DevOO.git

Conflicts:
	projet/devoo/src/main/java/controller/Controller.java
	projet/devoo/src/test/java/devoo/VueGestionLivraisonTest.java
Merge branch 'master' of https://github.com/H4305/DevOO
Affichage message erreur
Merge branch 'master' of https://github.com/H4305/DevOO.git

Conflicts:
	projet/devoo/src/main/java/controller/Controller.java
	projet/devoo/src/main/java/util/XMLLoader.java
Merge branch 'master' of https://github.com/H4305/DevOO.git

Conflicts:
	projet/devoo/src/main/java/util/XMLLoader.java
Affichage demande livraison par couleur ok + Test chargment Livraison