Merged your entities branch for you

https://github.com/GlowstoneMC/Glowstone/pull/282

Pull this to make it easier for you to continue working on this (if needed), and to make it easier for the glowstone devs to integrate this when it's done.

(or just close it if you want to do the merge manually yourself)