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

.gitignore

files/px4/widgets/px4_mc_position_pid_params.qgw

files/xplane/QRO_X/QRO_X.acf

files/xplane/QRO_X/QRO_X_paint.png

libs/thirdParty/3DMouse/win/I3dMouseParams.h

libs/thirdParty/3DMouse/win/Mouse3DInput.cpp

libs/thirdParty/3DMouse/win/Mouse3DInput.h

libs/thirdParty/3DMouse/win/MouseParameters.cpp

libs/thirdParty/3DMouse/win/MouseParameters.h

qgroundcontrol.pro

src/PX4FirmwareUpgradeWorker.cc

src/PX4FirmwareUpgradeWorker.h

src/apps/qupgrade/QUpgradeApp.cc

src/apps/qupgrade/QUpgradeMainWindow.cc

src/apps/qupgrade/QUpgradeMainWindow.h

src/apps/qupgrade/QUpgradeMainWindow.ui

src/comm/QGCHilLink.cc

src/comm/QGCXPlaneLink.cc

src/comm/QGCXPlaneLink.h

src/input/Mouse6dofInput.cpp