Merge branch 'master' into sig504_1

Conflicts:
	AWorld/Assets/Script/Beacon.cs
	AWorld/Assets/SiggWorking.unity
Merge branch 'sig504_1'
Merge remote-tracking branch 'origin/sig504_1'

Conflicts:
	AWorld/Assets/Script/Player.cs