orxonox/trunk: merged the WorldEntities into the Trunk. Merged with command: svn merge branches/world_entities/ trunk/ -r5516:HEAD
conflics from world_entities changed in favor of branches/world_entity all other conflict in favor of the trunk