Master Merge
asdfasdfasdf
Animation update
Merge branch 'master' into develop

Conflicts:
	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/TestScene.unity
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/31/31424cfd902579647acbc1dba696e0fb
	Library/metadata/af/af23e14fddca6044a94a494dc4dd8702
	Library/metadata/b7/b75e45a827e774045bc9f423647a611e
	Library/metadata/f2/f2d85546877ae5246a7706aff3a0b768
	Library/metadata/f4/f49cc63f44982374c80bdbf8a1afd820
	ProjectSettings/QualitySettings.asset
	TienJam-csharp.sln
	TienJam.sln