Final
Merge branch 'master' of github.com:Pysis868/Castlevival

Conflicts:
	Castlevival/Assembly-CSharp-firstpass-vs.csproj
	Castlevival/Assembly-CSharp-firstpass.csproj
	Castlevival/Assembly-CSharp-vs.csproj
	Castlevival/Assembly-CSharp.csproj
	Castlevival/Assembly-UnityScript-firstpass-vs.unityproj
	Castlevival/Assembly-UnityScript-firstpass.unityproj
	Castlevival/Assembly-UnityScript-vs.unityproj
	Castlevival/Assembly-UnityScript.unityproj
	Castlevival/Castlevival-csharp.sln
	Castlevival/Castlevival.sln
	Castlevival/Library/AssetServerCacheV3
	Castlevival/Library/CurrentMaximizeLayout.dwlt
	Castlevival/Library/EditorUserBuildSettings.asset
	Castlevival/Library/InspectorExpandedItems.asset
	Castlevival/Library/ProjectSettings.asset
	Castlevival/Library/ScriptAssemblies/Assembly-CSharp.dll
	Castlevival/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Castlevival/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Castlevival/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb