update from mark windows
Merge branch 'master' of https://github.com/instantview/G64SWE

Conflicts:
	SpaceTrader/SpaceTraderApp/Form1.Designer.cs