pid.c: fixed bad merge of seatbelt_multirotor, should fix EASY/AUTO modes
pid.limit != 0 fix
Make sure the unit tests aren't included as part of the standard firmware
Allow mixer upload when PWM is on
respect NAV_TAKEOFF_ALT instead of using hardcoded default takeoff value
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into v2bind
Merge pull request #374 from julianoes/hotfix_mixer

Allow mixer upload when PWM is on
multirotor_pos_control: added takeoff gap (hardcoded 3m), fixed code style
Added parameter NAV_TAKEOFF_GAP
Merge branch 'respect_takeoff_alt'
Set sane defaults for F330
v4 compatibility
Merge branch 'master' of github.com:PX4/Firmware
MAVLink workaround
Hotfix for USB: Starting MAVLink only on USB if connected. Needs rewrite of MAVLink and delay / retries for correct approach
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into v2bind