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

@@ -197,7 +197,6 @@ class ImplantSetEditorDlg(wx.Dialog):
             try:
                 sIS.importSets(text)
                 self.stNotice.SetLabel("Patterns successfully imported from clipboard")
-                self.showInput(False)
             except ImportError as e:
                 pyfalog.error(e)
                 self.stNotice.SetLabel(str(e))
@@ -205,7 +204,7 @@ class ImplantSetEditorDlg(wx.Dialog):
                 pyfalog.error(e)
                 self.stNotice.SetLabel("Could not import from clipboard: unknown errors")
             finally:
-                self.updateChoices()
+                self.entityEditor.refreshEntityList()
         else:
             self.stNotice.SetLabel("Could not import from clipboard")