.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Character/Emcee.cs
	ProjectSettings/EditorBuildSettings.asset
emcee