Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9