3d update
Merge remote-tracking branch 'origin/master'

Conflicts:
	unity/Mages/Mages-csharp.sln
	unity/Mages/Mages.sln
Merge branch 'master' of https://github.com/Grimm-Mushroom/Mages

Conflicts:
	unity/Mages/Assets/first.unity
	unity/Mages/Assets/first/NavMesh.asset
	unity/Mages/Assets/scripts/Mooving.cs
	unity/Mages/Library/CurrentLayout.dwlt
	unity/Mages/Library/InspectorExpandedItems.asset
	unity/Mages/Library/ScriptAssemblies/Assembly-CSharp.dll
	unity/Mages/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	unity/Mages/Library/assetDatabase3
	unity/Mages/Library/metadata/66/664dd48d9c6d55c47be61bb662f8623f
	unity/Mages/Mages-csharp.sln
	unity/Mages/Mages.sln
	unity/Mages/Mages.userprefs
	unity/Mages/ProjectSettings/TagManager.asset