Merge branch 'master' of github.com:simplyianm/bukkit-bootstrap
Merge branch 'master' of github.com:simplyianm/cloudgame into barapi-softdepend