MagasinController modifié
Merge branch 'master' of https://github.com/ahmedtahaaroua/GDA

Conflicts:
	build/classes/com/wide/control/FournisseursController.class
	build/classes/com/wide/control/MagasinController.class