Merging to master
Added act1forestv2 / Merge branch 'master' of https://github.com/Darth-Knoppix/WithoutSalt

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/18/182b253eec5bf304e8b1d9760a7b4d0c
	Library/metadata/71/7162f2e00fcda194bb3a0b1dc065a153
	Library/metadata/7e/7e17deb0c1906814a973e8e9f8228e8a
	Library/metadata/94/94c3bed2471e75248acc0cde8c8ac16d
	Library/metadata/be/beab29b1b2bf032498b780ff60aae597
	Library/metadata/dd/dd076a9b1eb789140948f1c4b578e127