Merge remote-tracking branch 'upstream/master' into lazyloader

src/scripts/settings/webSettings.js

@@ -2,7 +2,7 @@ let data;
 
 function getConfig() {
     if (data) return Promise.resolve(data);
-    return fetch("/config.json?nocache=" + new Date().getUTCMilliseconds()).then(function (response) {
+    return fetch('/config.json?nocache=' + new Date().getUTCMilliseconds()).then(function (response) {
         data = response.json();
         return data;
     });
@@ -12,7 +12,7 @@ export function enableMultiServer() {
     return getConfig().then(config => {
         return config.multiserver;
     }).catch(error => {
-        console.log("cannot get web config:", error);
+        console.log('cannot get web config:', error);
         return false;
     });
 }