Merge remote-tracking branch 'origin/ksBranches' into ksBranches

Conflicts:
	[Scene]/ShootingGame.unity