That was easy.
Merging

MapSync Icons

Updated existing icon and added a new one for when things have changed.

Switch to windeployqt to pull in install dependencies

Fixing map cache for Qt 5.5.1

Map cacheing for < 5.5.0 was broken and we were using whatever default was provided by QtLocation. Now we're properly creating and configuring a cache manager.

Adding Qt Location headers for Qt 5.5.1

This only affects the build when using Qt 5.5.1. Other versions are unchanged.
So far only tested with Mac OS.

Conflicts:
	QGCSetup.pri

Arrowhead for vehicle heading identification.

add travis-ci and appveyor build status

Fix Windows postbuild error

Readd Linux Shortcut Entry

-this is used in the ubuntu package

set QGC version from git

flight mode support for ArduPilot

Precompile a handful of Qt headers to speed up compilation time

MainWindow is now 100% Qml

add qt5-qtlocation-devel for fedora

+ fix "Unknown module(s) in QT: location-private positioning-private"

Home position fixes

appveyor s3 deploy

Move Analyze view to widget

Also remove Move Up and Move Down support