martins grejer, jon som skrev
Merge branch 'master' of https://github.com/Sc4reCr0we/RuinPrototype into Helge

Conflicts:
	Assets/Prefabs/Abilities_instance/Fireball_instance.prefab
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/05/0516d6d34a2f4e64c85cd447b753c6ba
	Library/metadata/23/2334d43cd662a8644b36278876780127
	Library/metadata/46/46760828929d33d4caf957a16bf02fbc
	Library/metadata/49/49d4a4c1003c4134198e49445e7e0166
	Library/metadata/84/849245070cdb18942864ff6008e76026
	Library/metadata/ba/ba62649bd5d34a74cbb2fc7735e7c920
	Library/metadata/c6/c659c9a30807fdf40adcd1c96cab1cad
	Library/metadata/d4/d40f221ea1e6c1943ab40d51fc41259a
	ProjectSettings/TagManager.asset
	RuinPrototype.userprefs