Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py

gui/builtinStatsViews/resourcesViewFull.py

@@ -24,7 +24,7 @@ from gui import pygauge as PG
 import gui.mainFrame
 import gui.chromeTabs
 
-from eos.types import Hardpoint
+from eos.saveddata.module import Hardpoint
 
 from gui.utils.numberFormatter import formatAmount