Mergemerge
added middle energyball thing
Merge branch 'master' of https://github.com/Sc4reCr0we/RuinPrototype into Helge

Conflicts:
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/01/01f8744539f03df4d97ac42e113c9a4a
	Library/metadata/12/12e164431dbd8714bbde0aeef453b764
	Library/metadata/15/15ebe1dba0b4f3148a966e39acff09c8
	Library/metadata/27/27275fc7df2ec0346ba12831e6a01345
	Library/metadata/37/37590480333382341b5007dec2a032c6
	Library/metadata/d9/d9a637e69b9f0a7449ee6b6e158ddd5b
	Library/shadercompiler-1.log