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/builtinContextMenus/commandFits.py

@@ -18,7 +18,7 @@ class CommandFits(ContextMenu):
     menu = None
 
     @classmethod
-    def populateFits(cls, evt):
+    def fitChanged(cls, evt):
         # This fires on a FitChanged event and updates the command fits whenever a command burst module is added or
         # removed from a fit. evt.typeID can be either a int or a set (in the case of multiple module deletions)
         if evt is None or (getattr(evt, 'action', None) in ("modadd", "moddel") and getattr(evt, 'typeID', None)):
@@ -29,8 +29,12 @@ class CommandFits(ContextMenu):
 
             if evt is None or not ids.isdisjoint(cls.commandTypeIDs):
                 # we are adding or removing an item that defines a command fit. Need to refresh fit list
-                sFit = Fit.getInstance()
-                cls.commandFits = sFit.getFitsWithModules(cls.commandTypeIDs)
+                cls.populateFits(evt)
+
+    @classmethod
+    def populateFits(cls, evt):
+        sFit = Fit.getInstance()
+        cls.commandFits = sFit.getFitsWithModules(cls.commandTypeIDs)
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -62,7 +66,6 @@ class CommandFits(ContextMenu):
 
         if len(self.__class__.commandFits) < 15:
             for fit in sorted(self.__class__.commandFits, key=lambda x: x.name):
-                print(fit)
                 menuItem = self.addFit(rootMenu if msw else sub, fit, True)
                 sub.Append(menuItem)
         else: