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

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/CurrentLayout.dwlt
	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/shadercompiler-1.log
	Ruin_Prototype.userprefs
added particle effects
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Martin

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Helge.unity
	Assets/Sprites/GUI/Cursor/cursor_target.png.meta
	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.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/93/9306763c2e2a3ce43856a9016171352f
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
Prepare for merge with master
updated fireball prefab
added and fixed particle effects for some abilities.
nothing
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into Helge

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