0
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	XVGame2D-csharp.sln
	XVGame2D.sln