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

eos/effects/energydestabilizationnew.py

@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/energyneutralizerfalloff.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Energy Neutralizer (51 of 51)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/entityenergyneutralizerfalloff.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Drones from group: Energy Neutralizer Drone (3 of 3)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/structureenergyneutralizerfalloff.py

@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/structurewarpscrambleblockmwdwithnpceffect.py

@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 # Not used by any item
 runTime = "early"

eos/effects/warpscrambleblockmwdwithnpceffect.py

@@ -3,7 +3,7 @@
 # Used by:
 # Modules named like: Warp Scrambler (26 of 26)
 
-from eos.types import State
+from eos.saveddata.module import State
 
 runTime = "early"
 type = "projected", "active"