Further work
Merge remote-tracking branch 'origin/master'

Conflicts:
	TGPGame/TGPGame.pidb