Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups

Conflicts:
	src/modules/px4iofirmware/registers.c
Startup script for simple logging
Merge pull request #562 from julianoes/logger_startup

Startup script for simple logging
Merge remote-tracking branch 'julian/fw_autoland_att_tecs_navigator_termination_controlgroups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Merge remote-tracking branch 'upstream/navigator_new' into fw_autoland_att_tecs_navigator_termination_controlgroups
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Paranoid PPM shape checking
Pure formatting cleanup of drv_hrt.c, no code / functionality changes
Hotfix: Reduce mag influence on att estimate
Hotfix: Better dead zone defaults
fw autoland: add parameter for heading hold distance, fix heading hold
Merged master
Working around creating an error condition with more than 8 raw RC channels
Allow to disable a channel
Fix return value
Attitude_estimator_ekf: Fix params, this bug caused the multirotor_att_control to stop
Merge pull request #563 from PX4/hotfix_ekf_params

hotfix for ekf params hotfix
PX4IO driver: even compiling now
Merge remote-tracking branch 'px4/master' into control_groups
Startup script for Wing Wing (Z-84)