22:42
Signed-off-by: fares <fareszone@gmail.com>
Merge branch 'master' of https://github.com/ahmedtahaaroua/GDA

Conflicts:
	build/classes/com/wide/control/ApprovisionemmentController$ApprovisionemmentControllerConverter.class
	build/classes/com/wide/control/ApprovisionemmentController.class
	build/classes/com/wide/control/CommandeController.class
	build/classes/com/wide/control/FamilleController.class
	build/classes/com/wide/control/LigneCommandeController.class
	build/classes/com/wide/control/LigneTransfertController.class
	build/classes/com/wide/control/LigneapprovisionnementController.class
	build/classes/com/wide/control/LignelivraisonController.class
	build/classes/com/wide/control/LignelivraisonmagasinController.class
	build/classes/com/wide/control/LivraisonmagasinController.class
	build/classes/com/wide/control/MagasinController.class
	build/classes/com/wide/control/MagasinproduitController.class
	build/classes/com/wide/control/ProduitController.class
	build/classes/com/wide/control/TransfertController.class
	build/classes/com/wide/control/UtilisateurController.class