added new things
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/player Test.unity
	Assets/Scenes/player Test/NavMesh.asset
	Assets/Scenes/player Test/NavMesh.asset.meta
	Assets/Scripts/player/HSMManager.cs
	Assets/Scripts/util/NavTarget.cs
	Assets/Textures.meta
	Assets/Textures/GUI.meta
	ProjectSettings/ProjectSettings.asset
fixes