Conflicts:
	qgcunittest/UASUnitTest.cc
	qgcunittest/UASUnitTest.h
	qgroundcontrol.pro
	src/uas/SlugsMAV.cc
	src/uas/UAS.cc
	src/uas/UAS.h
	src/uas/UASManager.cc
	src/ui/MainWindow.cc
	src/ui/MapWidget.cc
	src/ui/QGCRemoteControlView.cc
	src/ui/WaypointList.cc
	src/ui/uas/UASView.cc