Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Game2-csharp.v12.suo
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ShaderCache.db
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/15/15165fd4162f640338fecd68f55abc28
	Library/metadata/ca/ca40f53fcae3b4a108c0e7554c59a348
	Library/shadercompiler-1.log
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

GUI now actually in game
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems