fixes
Merge branch 'master' of github.com:JeffM2501/GPX02

Conflicts:
	GPX02_Client/Assets/Scenes/Testing/Test.unity