Merge branch 'master' into development

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

gui/utils/exportHtml.py

@@ -31,6 +31,7 @@ class exportHtml():
 class exportHtmlThread(threading.Thread):
     def __init__(self, callback=False):
         threading.Thread.__init__(self)
+        self.name = "HTMLExport"
         self.callback = callback
         self.stopRunning = False