metadata commit
Merge branch 'master' of https://github.com/azbk/LOTJ2

This reverts commit 92f421e111892ff87583bb6d17fd353e500712aa.

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
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/splashScreens/spriteSelection.js
	LOTJ2-csharp.sln
	LOTJ2.sln
	LOTJ2.userprefs
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/20/2004fae423b8230428964e40f5c720e0
	Library/metadata/49/497b03b844cb9439584ea22edbf10b29
	Library/metadata/69/697c17e74ba89f044942e6ebd723c245
	Library/metadata/69/69823f6fae1dc40b3b0c33fc305dd3c8
	Library/metadata/88/88907f689cb94014980290b8ee139c22
	Library/metadata/b2/b26c84707bd9c4e159d3baa69e9f597b