Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into restyling

Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
Fixed null pointer issue
Fixed issue when custom message set is enabled
Fixed HUD / Video widget to be useful
Merge
Merge