Conflicts:
	src/MissionManager/MissionController.h

Terrain Query: Better logging

Corridor Scan: Fix bad Vertex reference

Fixed Wing Landing pattern: Change from Descent Rate to Glide slope

Pile 'o bug fixes

Make reusable Stats control for TransectStyleComplexItem

The build system will look for src/Airmap/Airmap_api_key.h
If it find is, it will used the provided API key and client ID for Airmap.
That file should provide two strings:
static const char* kAirmapAPIKey = "key data";
static const char* kAirmapClientID = "id data";

Local builds, without these will have no Airmap support by default (users can always enter their own within the Airmap settings panel).

# Conflicts:
#	libs/mavlink/include/mavlink/v2.0
#	src/QmlControls/QmlObjectListModel.h

Random fixes

FlightDisplay : Remove sentence about disabling arming check

Corridor Scan: Fix load/save bugs

PolyLine load kml support

Corridor Scan Terrain: Add support for max rates and tolerance

Update gstreamer Linux install instructions