Merge remote-tracking branch 'origin/master'

Conflicts:
	projet/devoo/.classpath
	projet/devoo/src/test/java/util/XMLLoaderTest.java