Merge branch 'master' of git://github.com/SpongePowered/SpongeAPI into chat

Conflicts:
	src/main/java/org/spongepowered/api/Game.java