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/builtinMarketBrowser/events.py

@@ -4,4 +4,4 @@ import wx.lib.newevent
 ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent()
 
 RECENTLY_USED_MODULES = -2
-MAX_RECENTLY_USED_MODULES = 20
+MAX_RECENTLY_USED_MODULES = 20

gui/builtinMarketBrowser/marketTree.py

@@ -96,4 +96,3 @@ class MarketTree(wx.TreeCtrl):
 
         self.SelectItem(item)
         self.marketBrowser.itemView.selectionMade()
-

gui/builtinMarketBrowser/metaButton.py

@@ -1,4 +1,4 @@
-from gui.builtinMarketBrowser.events import *
+import wx
 from logbook import Logger
 
 pyfalog = Logger(__name__)

gui/builtinMarketBrowser/searchBox.py

@@ -10,4 +10,4 @@ class SearchBox(PFSearchBox):
         self.SetSearchBitmap(searchBitmap)
         self.SetCancelBitmap(cancelBitmap)
         self.ShowSearchButton()
-        self.ShowCancelButton()
+        self.ShowCancelButton()