update some stuff
Merge branch 'master' of
https://github.com/BoundlessWisdom/WorldGame.git

Conflicts:
	com/nathandsimon/lwjglgameutils/CompoundObject.java