Merge branch 'master' into hil_flightgear

...avlink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h

libs/mavlink/include/mavlink/v1.0/ardupilotmega/version.h

libs/mavlink/include/mavlink/v1.0/common/common.h

.../include/mavlink/v1.0/common/mavlink_msg_battery_status.h

...k/include/mavlink/v1.0/common/mavlink_msg_setpoint_6dof.h

...k/include/mavlink/v1.0/common/mavlink_msg_setpoint_8dof.h

libs/mavlink/include/mavlink/v1.0/common/testsuite.h

libs/mavlink/include/mavlink/v1.0/common/version.h

libs/mavlink/include/mavlink/v1.0/matrixpilot/matrixpilot.h

libs/mavlink/include/mavlink/v1.0/matrixpilot/version.h

libs/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.h

libs/mavlink/include/mavlink/v1.0/pixhawk/version.h

libs/mavlink/include/mavlink/v1.0/sensesoar/sensesoar.h

libs/mavlink/include/mavlink/v1.0/sensesoar/version.h

qgroundcontrol.pri

src/comm/QGCXPlaneLink.cc

src/input/JoystickInput.cc

src/input/JoystickInput.h

src/uas/UAS.cc

src/uas/UAS.h