merge dashboard into electron

diff --cc package-lock.json
index 734b4dc,3308d27..29fe355
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -9043,18 -6207,9 +9043,9 @@@
          }
        }
      },
- <<<<<<< HEAD
-     "sigmund": {
-       "version": "1.0.1",
-       "resolved": "http://registry.npm.taobao.org/sigmund/download/sigmund-1.0.1.tgz",
-       "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-       "dev": true
-     },
- =======
- >>>>>>> 4858d034428344bb200f473e998ae61b8f259a87
      "signal-exit": {
        "version": "3.0.2",
 -      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 +      "resolved": "http://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz",
        "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
        "dev": true
      },

diff --cc package.json
Simple merge