catch up

catch up commit
Merge branch 'master' of https://github.com/radman5/SSSRepo

Conflicts:
	MissionPlannerTester/GCSViews/FlightPlanner.cs