Merge branch 'master' of https://github.com/Ether1Project/Ether1DesktopWallet

assets/templates/wallets.html

@@ -86,7 +86,7 @@
 </div>
 
 <!-- The modal to import from private key -->
-<div id="dlgImportFromPrivateKey" class="modalDialog" data-izimodal-title="Import private ley" data-izimodal-subtitle="Import account from private key" data-izimodal-icon="icon-home">
+<div id="dlgImportFromPrivateKey" class="modalDialog" data-izimodal-title="Import private key" data-izimodal-subtitle="Import account from private key" data-izimodal-icon="icon-home">
 <div class="modalBody">
   <div class="form-group">
     <label for="inputPrivateKey">Private Key:</label>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Ether1Wallet",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1414,9 +1414,9 @@
       }
     },
     "js-yaml": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
-      "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -1550,9 +1550,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "loud-rejection": {
       "version": "1.6.0",