Conflicts:
	qgroundcontrol.pro
	src/comm/SerialLink.cc
	src/uas/QGCMAVLinkUASFactory.cc
	src/ui/CommConfigurationWindow.cc
	src/ui/MainWindow.cc
	src/ui/MainWindow.h
	src/ui/QGCParamWidget.h
	thirdParty/mavlink/include/mavlink_types.h