orxonox/branches/physics: merged the trunk back to the physics-branche merged with command: svn merge -r 4301:HEAD trunk/ branches/physics/ little conflict in particle-system resolved easily