test
Merge origin/master

Conflicts:
	src/kkdev/kksystem/controller/pluginmanager/PluginManager.java