mc_pos_control: use current velocity to calculate position setpoint on reset to make transition to stabilized modes more smooth
mc_pos_control: use MPC_XXX_FF to adjust setpoint on reset
Merge branch 'master' into smooth_pos_hold
Merge branch 'master' into smooth_pos_hold
Merge branch 'master' into smooth_pos_hold
mc_pos_control: manual and offboard control reorganization and cleanup
mc_pos_control: more accurate position setpoint reset, keep attitude setpoint continuous
Merge pull request #886 from PX4/smooth_pos_hold

Smooth transitions to stabilized modes
mixers: adapted FX79 mixer to have more pitch influence
Startup script: added viper script

Conflicts:
	mavlink/include/mavlink/v1.0
mixers: added Viper mixer
Merge pull request #1261 from PX4/rcviper

Viper and FX79 mixer
merge master