Merge remote-tracking branch 'upstream/master' into patch-6

to fix the conflicts with current master

config/rzl.js

@@ -406,7 +406,7 @@ const config : Config = {
     infoscreen: {
       name: "Infoscreen",
       position: [255, 495],
-      icon: "developer-board",
+      icon: "television-guide",
       iconColor: ({infoscreen}) => infoscreen == "on" ? "#4444FF" : "#000000",
       ui: [
         {
@@ -441,6 +441,18 @@ const config : Config = {
           text: "Open Webinterface"
         }
       ]
+    },
+    partkeepr: {
+      name: "Partkeepr",
+      position: [48, 450],
+      icon: "chip",
+      ui: [
+        {
+          type: "link",
+          link: "http://partkeepr.rzl/",
+          text: "Open Partkeepr"
+        }
+      ]
     }
   },
   layers: [