Revert "Revert "Merge remote-tracking branch 'GlowstoneMain/master'""

This reverts commit a845631ede962aa986762174dd69e97a0fe09e1b.

Conflicts:
	src/main/java/net/glowstone/GlowWorld.java