Small changes before new fork.
bs
Reverted to original Character Controller movement for NPC's. Rotation of the model can be changed at a later date, it's not important enough to spend any more time on now.
Merge commit 'HEAD@{3}' into BTest

Conflicts:
	AS/AS-csharp.sln
	AS/AS.sln
	AS/Assets/Assets/Animators/New Animator Controller.controller
	AS/Assets/AstarPathfindingProject/Core/AI/AIPath.cs
	AS/Assets/Prefabs/NPCprefab.prefab
	AS/Assets/Prefabs/NPCprefab1.prefab
	AS/Assets/Scripts/Collision.cs
	AS/Assets/Scripts/NPCs/Anim.cs
	AS/Assets/Scripts/NPCs/AstarAI.cs
	AS/Assets/Scripts/NPCs/NPCActions.cs
	AS/Assets/_Scenes/Test1.unity
	AS/Library/InspectorExpandedItems.asset
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll
	AS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll
	AS/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	AS/Library/assetDatabase3
	AS/Library/expandedItems
	AS/Library/guidmapper
	AS/Library/metadata/13/13c800f349a25584283af7d12c14da0a
	AS/Library/metadata/1d/1da85f72a7a82bc4eabdbd8f0683bde2
	AS/Library/metadata/20/200dcc3068ea2ec43843158132b20606
	AS/Library/metadata/2d/2dfacf14877688642a49ece87e23e302
	AS/Library/metadata/6a/6ae98d296990fa14c93e09204554e8aa
	AS/Library/metadata/76/7639d3eacf0346443a08e1aa28841de8
	AS/Library/metadata/7e/7e212db0aa2c00b448aa511ece336f20
	AS/Library/metadata/7f/7fdfb9a3e0fdf4df880ebc7fa5f56398
	AS/Library/metadata/91/918a6ed0b6fabc1408a9d15074e92dfd
	AS/Library/metadata/9f/9f7f5b0b0dc816c4b80272fb8a6bfe2a
	AS/Library/metadata/a1/a13fed205b1fa3942abfab7ba21463ec
	AS/Library/metadata/a8/a8582acccdc181e439c6065533612262
	AS/Library/metadata/b2/b268741d93778df48bdcc2dc70cc18e0
	AS/Library/metadata/b6/b667956babf1f0446a76fa8b99404ab8
	AS/Library/metadata/c5/c5ac18cdd242041b6bebc0e95b624c85
	AS/Library/metadata/ca/caeffedc34d9f4161b7694ad0d84bbd3
	AS/Library/metadata/e7/e7ddd0291445266459ab1ec3e8371658
	AS/Library/metadata/f8/f8136785e54fd1d459d2a3a0849fe770
	AS/Library/shadercompiler-1.log
cleaned up git comments after merge