Merge branch 'mp_merge' of https://github.com/diydrones/qgroundcontrol into integration_merge

qgroundcontrol.pro

src/QGCCore.cc

src/comm/LinkInterface.h

src/comm/SerialLink.cc

src/uas/UAS.cc

src/uas/UAS.h

src/ui/DebugConsole.cc

src/ui/DebugConsole.h

src/ui/DebugConsole.ui

src/ui/MAVLinkDecoder.cc

src/ui/MAVLinkDecoder.h

src/ui/MainWindow.cc

src/ui/MainWindow.h

src/ui/PrimaryFlightDisplay.cpp

src/ui/QGCTabbedInfoView.cpp

src/ui/QGCTabbedInfoView.h

src/ui/QGCTabbedInfoView.ui

src/ui/QGCVehicleConfig.cc

src/ui/QGCVehicleConfig.h

src/ui/QGCVehicleConfig.ui