aa

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

Conflicts:
	WebContent/magasin/List.xhtml
	build/classes/com/wide/control/MagasinController$MagasinControllerConverter.class
	build/classes/com/wide/control/MagasinController.class
	src/com/wide/control/MagasinController.java

Signed-off-by: arouaahmedtaha <arouaahmedtaha@gmail.com>