Merge branch 'master' of https://github.com/FourChar/mc-servermanager-plugin.git