Merge branch 'master' into apm_support

QGCApplication.pro

qgroundcontrol.qrc

src/FlightDisplay/FlightDisplayView.cc

src/FlightDisplay/FlightDisplayView.h

src/FlightDisplay/FlightDisplayView.qml

src/FlightMap/FlightMap.qml

src/FlightMap/FlightMapSettings.cc

src/FlightMap/FlightMapSettings.h

src/FlightMap/Images/MapCenter.svg

src/FlightMap/Images/MapType.svg

src/FlightMap/Images/PiP.svg

src/FlightMap/Images/ZoomMinus.svg

src/FlightMap/Images/ZoomPlus.svg

src/HomePositionManager.cc

src/MissionEditor/MissionEditor.cc

src/MissionEditor/MissionEditor.qml

src/MissionItem.cc

src/MissionItem.h

src/MissionItemTest.cc

src/MissionItemTest.h