Merge branch 'master' into development

Conflicts:
	config.py

gui/characterEditor.py

@@ -297,6 +297,9 @@ class SkillTreeView(wx.Panel):
 
         self.clonesChoice.Bind(wx.EVT_CHOICE, self.cloneChanged)
 
+        self.clonesChoice.SetToolTip(
+            wx.ToolTip("Setting an Alpha clone does not replace the character's skills, but rather caps them to Alpha levels."))
+
         pmainSizer.Add(hSizer, 0, wx.EXPAND | wx.ALL, 5)
 
         # Set up timer for skill search

gui/crestFittings.py

@@ -407,7 +407,13 @@ class FittingsTreeView(wx.Panel):
 
     def displayFit(self, event):
         selection = self.fittingsTreeCtrl.GetSelection()
-        fit = json.loads(self.fittingsTreeCtrl.GetPyData(selection))
+        data = self.fittingsTreeCtrl.GetPyData(selection)
+
+        if data is None:
+            event.Skip()
+            return
+
+        fit = json.loads(data)
         list = []
 
         for item in fit['items']: