Conflicts:
	src/ui/QGCVehicleConfig.cc
	src/ui/QGCVehicleConfig.h
	src/ui/QGCVehicleConfig.ui
	src/ui/uas/UASControlWidget.cc
	src/ui/uas/UASListWidget.h
	src/ui/uas/UASQuickView.cc