I have no idea how this was building elsewhere at all.

# Conflicts:
#	src/Vehicle/Vehicle.cc
#	src/api/QGCCorePlugin.cc

Custom Plan Save/Load

Limit pixel density fudge to Android only

Expose root plan keys

Dealing with pixel density on Windows and iOS

Allow a plugin to override iOS build settings.

If APM firmware type is disabled, skip all the firmware uploading

Change Log: Add initial 3.5 entries

Add initial 3.5 entries

Add change log

Add change log

Bring master up to date with Stable 3.4

Replacing colors with the ones provided by Airmap.
Adding border color and width.
Adding airspace ID so it can later be linked to the advisory list.

Terrain fixes

Also cleaning up annoying c++14 warnings.

Fix swapped climb/descent

Fix incorrect qCWarning

Hack fix for terrain crash when new query comes through before old query is complete

Renamed "Invalid" (airspace) to "custom"

Compass Cal: Don't show compass orientations for fixed orientation vehicles.

Plan: Fix defaulting when you "Change Command"

Hack fix for terrain crash when new query comes through before old query is complete

Don't show compass orientations for fixed orientation vehicles.

Fix Change Command parameter default setting