Merge branch 'master' into development

Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py

service/prefetch.py

@@ -31,24 +31,6 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-
-class PrefetchThread(threading.Thread):
-    def run(self):
-        # We're a daemon thread, as such, interpreter might get shut down while we do stuff
-        # Make sure we don't throw tracebacks to console
-        try:
-            es_Character.setSkillList(db.getItemsByCategory(
-                "Skill",
-                eager=("effects", "attributes", "attributes.info.icon", "attributes.info.unit", "icon")
-            ))
-        except:
-            pass
-
-
-prefetch = PrefetchThread()
-prefetch.daemon = True
-prefetch.start()
-
 # The following code does not belong here, however until we rebuild skeletons
 # to include modified pyfa.py, this is the best place to put it. See GH issue
 # #176