garycommit
Merge remote-tracking branch 'github_OB/GaryBranch'

Conflicts:
	OB/OB.csproj
temp save before gary continues