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

Corridor Scan: Tolerance based terrain follow

Restructure for TerrainQueryInterface abstract base class

Add TerrainCarpetQuery

Simplified error reporting

Corridor Scan initial terrain support

Only adjust existing waypoints. Does not add waypoints.

Restructure terrain query to support path query as well

Corridor Scan: Store/Load generated items from Plan file

Simple mission terrain support

Update mavlink v2.0 submodule Thu Mar 15 00:39:14 UTC 2018

AudioOutput: Create text to speech in constructor

Stable merge