nothing changed
Merge branch 'Develop' of https://github.com/AndrewBrough/projectmidnight into Develop

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	projectmidnight-git-csharp.sln
	projectmidnight-git.sln
nothing changed
Merge branch 'Develop' of https://github.com/AndrewBrough/projectmidnight into Develop

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/49/49ca4b7bdf10aa54593e263cf539b979
	Library/metadata/9e/9e4edbdedfd599f49a0bd88ee96449d9
	Library/metadata/b8/b814675adf9261e449175f9981db8aa2
	Library/metadata/e2/e2bc091df7167e74cbc611d569f27591
	Library/metadata/f2/f2454b7318874f944ad1a446bd1fd9da
	projectmidnight-git-csharp.sln
	projectmidnight-git.sln