more UI progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	3dgame/3dgame-csharp.sln
	3dgame/3dgame.sln
	3dgame/Library/CurrentLayout.dwlt
	3dgame/Library/CurrentMaximizeLayout.dwlt
	3dgame/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	3dgame/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	3dgame/Library/ScriptAssemblies/Assembly-CSharp.dll
	3dgame/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	3dgame/Library/assetDatabase3
	3dgame/Library/metadata/ab/abadfaf03445dd24e8ba1f3c953fc044
	3dgame/Library/shadercompiler-1.log