conflict on unused variable
Merge branch 'master' of ssh://git@github.com/wadinj/Plugins.git

Conflicts:
	src/graphic/ToolsMenu.java
	src/model/PluginFilter.java