navigator: skip takeoff if already above takeoff altitude
mc_pos_control: trajectory following, using previous and next waypoints
mission: takeoff and next waypoint related fixes
mc_pos_control: navigation fixes, smooth position setpoint movements
fw landing: use terrain estimate from global pos
Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain
Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_track
mc_pos_control: reset position setpoint on entering to AUTO mode
mc_pos_control: move position offset limiting to separate method
Merge branch 'hildistancesensor' into fwlandingterrain
Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain
fw landing: if using terrain estimate, don't switch back during landing
Merge branch 'terrainaltfield' into fwlandingterrain
remove warnx
Merge remote-tracking branch 'upstream/fwlandingterrain' into fwlandingterrain
fw landing: impose horizontal limit for start of flare
Merge remote-tracking branch 'upstream/master' into fwlandingterrain

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Merge branch 'flarehorizontallimit' into fwlandingterrain

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Merge remote-tracking branch 'upstream/master' into fwlandingterrain
fw landing: horiz flare check: fix wp distance

better calculation of wp distance when behind wp