orxonox/branches/physics: merged the trunk back to the physics-branche merged with command: svn merge -4 4283:HEAD ../../trunk/ . no conflicts