test
Merge branch 'master' of https://github.com/SogniDoro/EditeurUML.git

Conflicts:
	EditeurUML/.classpath
	EditeurUML/.settings/org.eclipse.jdt.core.prefs