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/mainFrame.py

@@ -456,7 +456,7 @@ class MainFrame(wx.Frame):
 
     @staticmethod
     def goForums(event):
-        webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=466425')
+        webbrowser.open('https://forums.eveonline.com/t/27156')
 
     @staticmethod
     def loadDatabaseDefaults(event):
@@ -1016,7 +1016,6 @@ class MainFrame(wx.Frame):
         del self.waitDialog
 
     def openGraphFrame(self, event):
-
         if not self.graphFrame:
             self.graphFrame = GraphFrame(self)