merge developing with desktopGCS and test_with_paparazzi