Merge branch 'master' into test-3

Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py

gui/builtinViewColumns/misc.py

@@ -49,6 +49,7 @@ class Miscellanea(ViewColumn):
             self.columnText = "Misc data"
             self.mask |= wx.LIST_MASK_TEXT
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.fittingView = fittingView
 
     def getText(self, stuff):
         return self.__getData(stuff)[0]
@@ -487,7 +488,7 @@ class Miscellanea(ViewColumn):
             if not hp or not cycleTime or not cycles:
                 return "", None
 
-            fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit())
+            fit = Fit.getInstance().getFit(self.fittingView.getActiveFit())
             ehpTotal = fit.ehp
             hpTotal = fit.hp
             useEhp = self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective
@@ -543,25 +544,7 @@ class Miscellanea(ViewColumn):
             return text, tooltip
         elif stuff.charge is not None:
             chargeGroup = stuff.charge.group.name
-            if chargeGroup in (
-                    "Rocket",
-                    "Advanced Rocket",
-                    "Light Missile",
-                    "Advanced Light Missile",
-                    "FoF Light Missile",
-                    "Heavy Assault Missile",
-                    "Advanced Heavy Assault Missile",
-                    "Heavy Missile",
-                    "Advanced Heavy Missile",
-                    "FoF Heavy Missile",
-                    "Torpedo",
-                    "Advanced Torpedo",
-                    "Cruise Missile",
-                    "Advanced Cruise Missile",
-                    "FoF Cruise Missile",
-                    "XL Torpedo",
-                    "XL Cruise Missile"
-            ):
+            if chargeGroup.endswith("Rocket") or chargeGroup.endswith("Missile") or chargeGroup.endswith("Torpedo"):
                 cloudSize = stuff.getModifiedChargeAttr("aoeCloudSize")
                 aoeVelocity = stuff.getModifiedChargeAttr("aoeVelocity")
                 if not cloudSize or not aoeVelocity: