orxonox/trunk: merged branches/physics back to the trunk merged with command svn merge -r 3866:HEAD . ../../trunk/ many conflict that i tried to resolv @patrick: i hope i did not interfere with your stuff :/