dfdf

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

Conflicts:
	WebContent/templateDepot/indexDepot.xhtml
	build/classes/com/wide/control/MagasinController.class