Fixed typo, merged

files/styles/style-dark.css

files/styles/style-light.css

qgroundcontrol.pro

src/comm/MAVLinkSimulationLink.cc

src/comm/MAVLinkSimulationMAV.cc

src/input/JoystickInput.cc

src/input/JoystickInput.h

src/uas/UAS.cc

src/uas/UAS.h

src/uas/UASInterface.h

src/ui/JoystickAxis.cc

src/ui/JoystickAxis.h

src/ui/JoystickAxis.ui

src/ui/JoystickButton.cc

src/ui/JoystickButton.h

src/ui/JoystickButton.ui

src/ui/JoystickWidget.cc

src/ui/JoystickWidget.h

src/ui/JoystickWidget.ui

src/ui/MainWindow.cc