Merge remote-tracking branch 'mainline/master' into mpng-mainline-merge

* mainline/master: (3180 commits)
  Copter: auto-disarm in Drift, Sport, OF_Loiter
  Copter: rename EKFCHECK_COMPASS to EKFCHECK_THRESH
  Copter: prevent false triggering of ekf_check
  AP_NavEKF : Modified compass fail logic
  Copter: Thr and Batt failsafe disarm when landed
  Copter: rename control_modes.pde to switches.pde
  AP_InertialSensor: some more debug info for VibTest
  Copter: use hal.rcout to send servo output to GCS
  Plane: rename enum for Telem2Protocol
  Copter: rename TELEM2_PROTOCOL to SERIAL2_PROTOCOL
  Rover: rename Tele2Protocol to Serial2Protocol
  Frame_params: Added Iris with 3 Positon Mode Switch.param
  Rover: Add SERIAL2_PROTOCOL for GCS and FRSky telemtry
  Plane: Add SERIAL2_PROTOCOL for GCS and FRSky telemtry
  Copter: Add SERIAL2_PROTOCOL for GCS and FRsky telemtry
  AP_Frsky_Telem: added initial Frsky telemetry library
  BaroGlitch: remove debug
  AP_Baro: fixed example build
  Replay: fix example sketch
  AP_Math: port examples to Linux
  ...

Conflicts:
	APMrover2/APMrover2.pde
	APMrover2/GCS_Mavlink.pde
	APMrover2/Log.pde
	APMrover2/Steering.pde
	APMrover2/defines.h
	APMrover2/system.pde
	ArduCopter/APM_Config.h
	ArduCopter/ArduCopter.pde
	ArduCopter/Attitude.pde
	ArduCopter/GCS.h
	ArduCopter/GCS_Mavlink.pde
	ArduCopter/Log.pde
	ArduCopter/Parameters.h
	ArduCopter/Parameters.pde
	ArduCopter/ReleaseNotes.txt
	ArduCopter/auto_tune.pde
	ArduCopter/commands_logic.pde
	ArduCopter/commands_process.pde
	ArduCopter/config.h
	ArduCopter/defines.h
	ArduCopter/events.pde
	ArduCopter/flip.pde
	ArduCopter/heli.pde
	ArduCopter/motors.pde
	ArduCopter/navigation.pde
	ArduCopter/radio.pde
	ArduCopter/setup.pde
	ArduCopter/system.pde
	ArduCopter/test.pde
	ArduPlane/ArduPlane.pde
	ArduPlane/Attitude.pde
	ArduPlane/GCS_Mavlink.pde
	ArduPlane/Log.pde
	ArduPlane/Parameters.pde
	ArduPlane/config.h
	ArduPlane/defines.h
	ArduPlane/radio.pde
	ArduPlane/rally.pde
	ArduPlane/system.pde
	ArduPlane/test.pde
	README.md
	Tools/Frame_params/Advanced.param
	Tools/Frame_params/Beginner.param
	Tools/Frame_params/CameraPlatform.param
	Tools/Frame_params/Intermediate.param
	Tools/Frame_params/Iris.param
	Tools/scripts/build_binaries.sh
	libraries/AC_WPNav/AC_WPNav.cpp
	libraries/AP_AHRS/AP_AHRS_DCM.cpp
	libraries/AP_Airspeed/AP_Airspeed.h
	libraries/AP_Baro/AP_Baro_MS5611.cpp
	libraries/AP_BattMonitor/AP_BattMonitor.h
	libraries/AP_GPS/AP_GPS_Auto.cpp
	libraries/AP_GPS/GPS.h
	libraries/AP_GPS/config/3DR-Ublox.txt
	libraries/AP_HAL/AP_HAL_Boards.h
	libraries/AP_HAL/HAL.h
	libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp
	libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp
	libraries/AP_HAL_AVR_SITL/HAL_AVR_SITL_Class.cpp
	libraries/AP_HAL_AVR_SITL/sitl_ins.cpp
	libraries/AP_HAL_Empty/HAL_Empty_Class.cpp
	libraries/AP_HAL_FLYMAPLE/HAL_FLYMAPLE_Class.cpp
	libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
	libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
	libraries/AP_HAL_PX4/Scheduler.cpp
	libraries/AP_HAL_PX4/UARTDriver.cpp
	libraries/AP_InertialNav/AP_InertialNav.cpp
	libraries/AP_InertialNav/AP_InertialNav.h
	libraries/AP_InertialSensor/AP_InertialSensor.cpp
	libraries/AP_InertialSensor/AP_InertialSensor.h
	libraries/AP_InertialSensor/AP_InertialSensor_Flymaple.cpp
	libraries/AP_InertialSensor/AP_InertialSensor_HIL.cpp
	libraries/AP_InertialSensor/AP_InertialSensor_HIL.h
	libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.cpp
	libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.h
	libraries/AP_InertialSensor/AP_InertialSensor_Oilpan.cpp
	libraries/AP_InertialSensor/AP_InertialSensor_PX4.cpp
	libraries/AP_InertialSensor/AP_InertialSensor_PX4.h
	libraries/AP_Motors/AP_Motors.h
	libraries/AP_Motors/AP_MotorsHeli.cpp
	libraries/AP_Motors/AP_MotorsHeli.h
	libraries/AP_Motors/AP_MotorsSingle.cpp
	libraries/AP_Motors/AP_MotorsSingle.h
	libraries/AP_Motors/AP_MotorsTri.cpp
	libraries/AP_Motors/AP_Motors_Class.cpp
	libraries/AP_Motors/AP_Motors_Class.h
	libraries/AP_Notify/AP_BoardLED.h
	libraries/DataFlash/DataFlash_Block.h
	libraries/DataFlash/LogFile.cpp
	libraries/GCS_MAVLink/GCS_MAVLink.h
	libraries/SITL/SITL.cpp
	libraries/SITL/SITL.h
	mk/PX4/ROMFS/init.d/rc.APM
	mk/px4_targets.mk
	mk/sketch_sources.mk
	mk/targets.mk