Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

controller-log42.txt

controller-log5.txt

controller-log6.txt

controller-log7.txt

controller-log8.txt

controller-log9.txt

controllerßlog.txt

gyro-temp

gyrosstemp.txt

new?log.txt

src/ui/HSIDisplay.cc

src/ui/watchdog/WatchdogControl.cc

src/ui/watchdog/WatchdogControl.h

temp.txt

temp2.txt

test

waypoints_A0_circle.txt

waypoints_A0_circlev10_redesign.txt

waypoints_A0_circlev11_redesign.txt

waypoints_A0_circlev12_redesign.txt