Merge branch 'master' of https://github.com/Chargeorge/Studio2

Conflicts:
	AWorld/Assets/Script/GameManager.cs