Cleaning up statement without effect
Added PX4 firmware uploader skeleton, operational on all levels, needs full protocol implementation
Fixed logging
Merge branch 'master' of github.com:mavlink/qgroundcontrol
Fixed another logging bug
Fixed last remaining bugs in logging, now reliable with Unix and non-Unix timestamps
Fixed zero order hold for logging
Fixed XPlane 9
Improved HSI display, hooking up next to UAS object
Fixes to X Plane HIL
gitignore windows shell temp file and .opensdf
Add 3DMouse SDK for Windows
Implementation of 6DOF 3DMouse input (Windows only)

Implementation of 6DOF 3DMouse input (Windows only). Not tested yet.
Send out mavlink setpoint 6dof messages for manual control
3DMouse Implementation for Windows completed (tested on win8 (and ubuntu 12.04))
Adding 3DMouse Support for LINUX (not completed)
3DMouse button mapping to separate translations and rotations (Both WINDOWS and LINUX)
Merge branch 'default_3DMouse' into masterMergeDefault3DMouse
Additional changes needed to adapt 3DMouse Interface from default3DMouse branch, but keep all the other stuff from master

Conflicts:
	qgroundcontrol.pro
	src/uas/UAS.cc
	src/uas/UAS.h
	src/ui/MainWindow.cc
	src/ui/MainWindow.h
Reenable input change by use of SkyeControlWidget
Some minor fixes for the use of 3DMouse (with Linux)