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 free cursor movement for gamepads
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
ljudpill
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Prefabs/Abilities_instance/Fireball_instance.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.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/57/578eee9f91dbb7a4fb4c446131be65d8
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
updated fireball prefab
some point
added and fixed particle effects for some abilities.
ljudsaker och fixat med min scen. också ändrat i slotmanagern
Merge branch 'master' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/05/05fda2f533097734789775105227c9f8
	Library/metadata/0c/0cdb85adf33cc8d41a8ba512320e7c3b
	Library/metadata/7c/7ccf8ee53a7f9b845ab61965aea45da4
	Library/metadata/db/dbdf97397aa596840ba3c2d2d3dd8916
	Library/metadata/fd/fda361712d92c5e4e940f140ff6534c7
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
asdasd
Added trail to execute
Merge branch 'Martin' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Assets/Prefabs/Abilities_instance/Fireball_instance.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.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/shadercompiler-1.log
	Ruin_Prototype.userprefs
be
asdsasd
ölj
Merge branch 'Martin' of https://github.com/Sc4reCr0we/Ruin_Prototype into dennis

Conflicts:
	Library/CurrentLayout.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/shadercompiler-1.log