Merge between ArduCopter and ArduPlane, switchable in flight