Merge branch 'ressources' of https://github.com/roipoussiere/packages into ressources

Conflicts:
	vle.extension.decision/src/vle/gvle/modeling/decision/RessourcesEditor.hpp
	vle.extension.decision/src/vle/gvle/modeling/decision/decision.glade~