Conflit géré.
Merge branch 'master' of ssh://git@github.com/wadinj/Plugins.git

Conflicts:
	test/model/PluginFinderTest.java