Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool

Conflicts:
	src/main/java/ui/TGUIAction.java