Move path
Merge branch 'master' of https://github.com/MarsClient/CMMarsClient

Conflicts:
	MarsClient/Assets/Scripts/AI/Common.meta
	MarsClient/Assets/Scripts/AI/Common/AiInput.cs
	MarsClient/Assets/Scripts/AI/Common/AiInput.cs.meta
	MarsClient/Assets/Scripts/AI/Common/AnimationMessageManager.cs
	MarsClient/Assets/Scripts/AI/Common/AnimationMessageManager.cs.meta
	MarsClient/Assets/Scripts/AI/Input.meta
	MarsClient/Assets/Scripts/AI/Player.meta
	MarsClient/Assets/Scripts/AI/Player/AiInput.cs
	MarsClient/Assets/Scripts/AI/Player/AiInput.cs.meta
	MarsClient/Assets/Scripts/AI/~NEW_AI.meta
	MarsClient/Assets/Scripts/AI/~NEW_AI/AiInput.cs
	MarsClient/Assets/Scripts/AI/~NEW_AI/AiInput.cs.meta
fixed conflict