Combat Mechanics

refining combat status, and some clean up
Merge branch 'master' of https://github.com/benmirath/Transcension

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scenes/3D model TEST.unity
	Transcension-csharp.sln
	Transcension.sln