Decrease I2C timeout in config so it matches the previous 500 us timeout as close as possible. This is necessary after fixing the NuttX I2C timeout logic
Merge branch 'master' of github.com:PX4/Firmware into i2c_timeout
Modified to use new FILE_TRANSFER_PROTOCOL message

- Also corrected system/component id transmit/check
Gave up on using bitfields
Merge pull request #1332 from PX4/FTP

Modified to use new FILE_TRANSFER_PROTOCOL message
Merge pull request #1320 from PX4/i2c_timeout

Decrease I2C timeout in config so it matches the previous 500 us timeout...
Merge branch 'master' of https://github.com/PX4/Firmware into vision_speed
UAVCAN update (lots of warning fixes)
UAVCAN: missing declaration warning fix
Merge pull request #1333 from PX4/uavcan_update

UAVCAN made warning-free
Merge branch 'master' of https://github.com/PX4/Firmware into vision_speed
inav: added vision speed timeout