launchdetector: add reset, #663
fw: reset landing and takeoff state if switched to manual
Merge remote-tracking branch 'upstream/master' into launchdetector

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Merge pull request #710 from thomasgubler/launchdetector

FW: launchdetector reset