prepare for pull master
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into martin

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.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/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/shadercompiler-1.log
added EMP and working stateController
added graphics for status effects
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

Conflicts:
	Assets/Helge.unity
	Assets/Prefabs/Ability_data/SmileyBomb.prefab
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/51/51ead51d621334646b85a5934092ad08
	Library/metadata/e7/e7deb2b90ae27d54ebcbdd736b9f6132
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs