Fix merge issues

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers

This reverts commit 52160d80.

Fixed inverse logic in camera parameter retry count
Skip close timeout if not Windows

Pulling mavlink with a reversal for the CAMERA_IMAGE_CAPTURED message. It's now back as it was so it won't break existing code.
The pull also brought changes to the GPS_RAW_INT message. Only MockLink uses. I entered zeros for all new fields.

Renamed main activity class with a more appropriate name.

Even though it hasn't been supported forever, the files where still
being compiled

- Fixes lost connections with FTDI radios
- Modified code to only test vendor id, all product ids are let through
- Modified code to pass log output through to C++ side
QGCLoggingCategory system