Correction problème getAjoutcarac
Merge branch 'Dev-V2' of https://github.com/rCollet/ACO_EDITEUR.git into
Dev-V2

Conflicts:
	TpTestAco/src/Model/Editor.java