Merge branch 'master' of github.com:mavlink/qgroundcontrol

files/flightgear/Aircraft/Rascal/Dialogs/config.xml

files/flightgear/Aircraft/Rascal/Engines/18x8.xml

files/flightgear/Aircraft/Rascal/Engines/Zenoah_G-26A.xml

files/flightgear/Aircraft/Rascal/Models/Rascal.rgb

files/flightgear/Aircraft/Rascal/Models/Rascal110-000-013.ac

...ft/Rascal/Models/Rascal110-000-013.ac.before-color-change

files/flightgear/Aircraft/Rascal/Models/Rascal110.xml

files/flightgear/Aircraft/Rascal/Models/Trajectory-Marker.ac

...s/flightgear/Aircraft/Rascal/Models/Trajectory-Marker.xml

files/flightgear/Aircraft/Rascal/Models/fix.sh

files/flightgear/Aircraft/Rascal/Models/smoke.png

files/flightgear/Aircraft/Rascal/Models/smokeW.xml

files/flightgear/Aircraft/Rascal/README.Rascal

files/flightgear/Aircraft/Rascal/Rascal-keyboard.xml

files/flightgear/Aircraft/Rascal/Rascal-submodels.xml

files/flightgear/Aircraft/Rascal/Rascal110-JSBSim-set.xml

files/flightgear/Aircraft/Rascal/Rascal110-JSBSim.xml

files/flightgear/Aircraft/Rascal/Rascal110-YASim-set.xml

files/flightgear/Aircraft/Rascal/Rascal110-YASim.xml

files/flightgear/Aircraft/Rascal/Rascal110-splash.rgb