Merge branch 'master' into singularity

gui/bitmapLoader.py

@@ -25,7 +25,7 @@ import time
 try:
     from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict
 
 cachedBitmapsCount = 0
 cachedBitmaps = OrderedDict()

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -26,7 +26,7 @@ import locale
 try:
     from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict
 
 class TargetingMiscViewFull(StatsView):
     name = "targetingmiscViewFull"

gui/itemStats.py

@@ -32,7 +32,7 @@ import config
 try:
     from collections import OrderedDict
 except ImportError:
-    from gui.utils.compat import OrderedDict
+    from utils.compat import OrderedDict
 
 class ItemStatsDialog(wx.Dialog):
     counter = 0