Merge branch 'master' into extensions-api

# Conflicts:
#	src/renderer/components/app.tsx
#	src/renderer/components/cluster-manager/clusters-menu.scss
#	src/renderer/components/cluster-manager/clusters-menu.tsx
#	src/renderer/components/layout/main-layout.tsx
#	src/renderer/components/layout/sidebar.tsx

package.json

@@ -2,7 +2,7 @@
   "name": "kontena-lens",
   "productName": "Lens",
   "description": "Lens - The Kubernetes IDE",
-  "version": "3.6.0-rc.2",
+  "version": "3.6.4",
   "main": "static/build/main.js",
   "copyright": "© 2020, Mirantis, Inc.",
   "license": "MIT",
@@ -151,6 +151,9 @@
         }
       ]
     },
+    "nsis": {
+      "include": "build/installer.nsh"
+    },
     "publish": [
       {
         "provider": "github",
@@ -214,6 +217,7 @@
     "semver": "^7.3.2",
     "serializr": "^2.0.3",
     "shell-env": "^3.0.0",
+    "spdy": "^4.0.2",
     "tar": "^6.0.2",
     "tcp-port-used": "^1.0.1",
     "tempy": "^0.5.0",
@@ -258,6 +262,7 @@
     "@types/request-promise-native": "^1.0.17",
     "@types/semver": "^7.2.0",
     "@types/shelljs": "^0.8.8",
+    "@types/spdy": "^3.4.4",
     "@types/tcp-port-used": "^1.0.0",
     "@types/tempy": "^0.3.0",
     "@types/terser-webpack-plugin": "^3.0.0",