Merge branch 'master' into v2.2.0b1

# Conflicts:
#	eve.db

scripts/jsonToSql.py

@@ -25,7 +25,7 @@ import re
 
 # Add eos root path to sys.path so we can import ourselves
 path = os.path.dirname(__file__)
-sys.path.append(os.path.realpath(os.path.join(path, "..")))
+sys.path.insert(0, os.path.realpath(os.path.join(path, "..")))
 
 import json
 import argparse
@@ -172,21 +172,6 @@ def main(db, json_path):
             newData.append(newRow)
         return newData
 
-    def convertTypes(typesData):
-        """
-        Add factionID column to evetypes table.
-        """
-        factionMap = {}
-        with open(os.path.join(jsonPath, "fsdTypeOverrides.json")) as f:
-            overridesData = json.load(f)
-        for typeID, typeData in list(overridesData.items()):
-            factionID = typeData.get("factionID")
-            if factionID is not None:
-                factionMap[int(typeID)] = factionID
-        for row in typesData:
-            row['factionID'] = factionMap.get(int(row['typeID']))
-        return typesData
-
     data = {}
 
     # Dump all data to memory so we can easely cross check ignored rows
@@ -199,8 +184,6 @@ def main(db, json_path):
             tableData = convertIcons(tableData)
         if jsonName == "phbtraits":
             tableData = convertTraits(tableData)
-        if jsonName == "evetypes":
-            tableData = convertTypes(tableData)
         if jsonName == "clonegrades":
             tableData = convertClones(tableData)
         data[jsonName] = tableData