v0.0.4 merge fixes

This is now officially support fan-material
Add Ship sheet
Layout fix for adversaries
Ability to remove skills on adversaries, useful when duplicating a adversary
Option to automatically apply spell cost when rolled
Added Armor compendium
Added Weapons compendium
Skills compendium updated with descriptions
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>

module/items/item-sheet.js

@@ -94,7 +94,6 @@ export class ItemSheetKH extends ItemSheet {
                         skillList.push(item)
                     }
                 }
-
                 this.position.width = 450;
                 this.position.height = 605;
                 break;

system.json

@@ -81,11 +81,6 @@
     "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
     "socket": true,
     "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
-<<<<<<< HEAD
     "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip",
     "license": "LICENCE.txt"
-=======
-    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip",
-    "license": ""
->>>>>>> master
 }