orxonox/branches/physics: merged the trunk back to branches/physics merged with command svn merge -r 4223:HEAD ../../trunk/ . conflicts additively included