Fixed some javadoc for the class and added methods to change contents of the world
Javadoced the thing, changed moveEntity to private
Removed some debug code
Fixed conflicts