Merge fix
Added WorldObject
Merge branch 'master' of https://github.com/philip98/CaveQuest.git

Conflicts:
	src/de/philip/net/server/Server.java