Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4

qgcresources.qrc

src/AutoPilotPlugins/APM/APMSubFrameComponent.qml

src/AutoPilotPlugins/APM/Images/simple5-frame.png

src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc

src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h

src/FirmwarePlugin/APM/MavCmdInfoCommon.json

src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json

src/FirmwarePlugin/PX4/MavCmdInfoCommon.json

src/MissionManager/FixedWingLandingComplexItem.cc

src/MissionManager/MavCmdInfoCommon.json

src/PlanView/FWLandingPatternEditor.qml

src/QmlControls/QGroundControlQmlGlobal.cc

src/QmlControls/QGroundControlQmlGlobal.h

src/comm/MockLink.cc

src/comm/MockLink.h

src/ui/preferences/MockLink.qml