Minor changes
Merge branch 'master' of github.com:deaddog/sw505-code

Conflicts:
	root/ProductCode/Control/MapControl.cs