bbb

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

Conflicts:
	build/classes/com/wide/control/CommandeController.class