changed statecontroller
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

Conflicts:
	Assets/Prefabs/Ability_data/Scatter.prefab
	Assets/Prefabs/Ability_data/Scatter_2.prefab
	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/shadercompiler-1.log
	Ruin_Prototype.userprefs