autolaunch: added param for delay
Merge remote-tracking branch 'julian/launchdelay' into launchdetectionstates
launchdetector: return state of detection

The launchdetector now has a intermediate state (controlsenabled) which
is meant to be interpreted by the controller as: "perform attitude
control but do not yet power up the motor". This can be used in the
floating phase during a bungee launch for example.
fw pos control: use new lauchdetector states
fw pos control: set default roll, pitch while waiting for launch
fw pos control: launchdetection logic cleanup
fw pos control: set pitch sp correctly while waiting for launch
Merge pull request #1303 from PX4/launchdetectionstates

Launchdetection improvements
Merge pull request #1344 from PX4/hildistancesensor

parse hil_optical_flow message
fix mission item to mavink waypoint conversion
Merge pull request #1346 from PX4/mavlinkabsrelalt

fix mission item to mavink waypoint conversion
Merge remote-tracking branch 'upstream/master' into landing

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp