orxonox/trunk: merged and copied all files from branches/chris into trunk. it all seems to be in propper order.