Merge branch 'master' into development

Conflicts:
	config.py

config.py

@@ -19,7 +19,7 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.33.3   "
+version = "1.33.3"
 tag = "git"
 expansionName = "Lifeblood"
 expansionVersion = "1.7"

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