update
Merge remote-tracking branch 'origin/master'

Conflicts:
	build-tmp/SplitWorlds$Door.class
	build-tmp/SplitWorlds$GameObject.class
	build-tmp/SplitWorlds$Man.class
	build-tmp/SplitWorlds$MovingPlatform.class
	build-tmp/SplitWorlds$Platform.class
	build-tmp/SplitWorlds$Spikes.class
	build-tmp/SplitWorlds.class