orxonox/trunk: merged branches/spaceshipControll back to the trunk: merged with command: svn merge -r5835:HEAD branches/spaceshipcontroll trunk conflicts resolved with dynamic indentation methodology algorithms