Merged in upstream master

.gitignore

ROMFS/px4fmu_common/init.d/3031_phantom

ROMFS/px4fmu_common/init.d/3032_skywalker_x5

ROMFS/px4fmu_common/init.d/rcS

makefiles/toolchain_gnu-arm-eabi.mk

nuttx-configs/px4fmu-v1/nsh/defconfig

nuttx-configs/px4fmu-v2/nsh/defconfig

src/drivers/airspeed/airspeed.cpp

src/drivers/airspeed/airspeed.h

src/drivers/drv_range_finder.h

src/drivers/ets_airspeed/ets_airspeed.cpp

src/drivers/hmc5883/hmc5883.cpp

src/drivers/meas_airspeed/meas_airspeed.cpp

src/drivers/mkblctrl/mkblctrl.cpp

src/lib/launchdetection/CatapultLaunchMethod.cpp

src/lib/launchdetection/CatapultLaunchMethod.h

src/lib/launchdetection/LaunchDetector.cpp

src/lib/launchdetection/LaunchDetector.h

src/lib/launchdetection/LaunchMethod.h

src/lib/launchdetection/launchdetection_params.c