Merge branch 'master' of github.com:PX4/Firmware into calibration

apps/drivers/device/cdev.cpp

apps/drivers/device/device.h

apps/px4/fmu/fmu.cpp

apps/px4/px4io/driver/px4io.cpp

apps/px4/px4io/driver/uploader.cpp

apps/px4/tests/test_sensors.c

apps/px4io/protocol.h

nuttx/configs/px4fmu/include/drv_bma180.h

nuttx/configs/px4fmu/include/drv_hmc5883l.h

nuttx/configs/px4fmu/include/drv_l3gd20.h

nuttx/configs/px4fmu/include/drv_lis331.h

nuttx/configs/px4fmu/include/drv_ms5611.h

nuttx/configs/px4fmu/src/Makefile

nuttx/configs/px4fmu/src/drv_bma180.c

nuttx/configs/px4fmu/src/drv_hmc5833l.c

nuttx/configs/px4fmu/src/drv_l3gd20.c

nuttx/configs/px4fmu/src/drv_lis331.c

nuttx/configs/px4fmu/src/drv_ms5611.c

nuttx/configs/px4fmu/src/up_nsh.c