mixing 2nd pass + weird fix bug OMG LAST COMMIT
Merge branch 'master' of https://github.com/Chargeorge/Studio2

Conflicts:
	AWorld/Assets/SiggWorking.unity