From d4d6bf8e7a399517837b14b4bea3b4e1cb36fb19 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Mon, 3 Sep 2018 23:55:22 +0300
Subject: [PATCH 01/35] i18n Localisation work

---
 package-lock.json                   | 46 +++++++++++++++++++++++++--
 package.json                        |  3 ++
 src/components/create.vue           |  2 +-
 src/components/dashboard.vue        |  4 ++-
 src/components/header-guest.vue     |  7 +++--
 src/config/i18n.js                  |  9 ++++++
 src/index.html                      | 27 +++++++++++++---
 src/store/index.js                  |  4 ++-
 src/store/modules/SettingsStore.js  | 49 +++++++++++++++++++++++++++++
 src/translations/common/en.json     | 36 +++++++++++++++++++++
 src/translations/operations/en.json | 20 ++++++++++++
 11 files changed, 194 insertions(+), 13 deletions(-)
 create mode 100644 src/config/i18n.js
 create mode 100644 src/store/modules/SettingsStore.js
 create mode 100644 src/translations/common/en.json
 create mode 100644 src/translations/operations/en.json

diff --git a/package-lock.json b/package-lock.json
index 0d57ba8f..9df31401 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,6 +36,14 @@
         }
       }
     },
+    "@panter/vue-i18next": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@panter/vue-i18next/-/vue-i18next-0.12.0.tgz",
+      "integrity": "sha1-SHXDjUW36kzk6HbWCFQWEnuGa0Y=",
+      "requires": {
+        "deepmerge": "2.1.1"
+      }
+    },
     "@paulcbetts/mime-db": {
       "version": "1.22.4",
       "resolved": "https://registry.npmjs.org/@paulcbetts/mime-db/-/mime-db-1.22.4.tgz",
@@ -2273,6 +2281,11 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "deepmerge": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz",
+      "integrity": "sha512-urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="
+    },
     "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -3624,8 +3637,7 @@
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "estraverse": {
       "version": "4.2.0",
@@ -4340,6 +4352,35 @@
         }
       }
     },
+    "i18next": {
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-11.6.0.tgz",
+      "integrity": "sha512-+eOdu1laoPX8l3zuaEFpf0MPYqAyKeX46WEjRkpPLp0TcijP3ww6NrDCPcRwX3yKB69R+ggiLvLGzCm8ALaVXQ=="
+    },
+    "i18next-node-fs-backend": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/i18next-node-fs-backend/-/i18next-node-fs-backend-2.0.0.tgz",
+      "integrity": "sha512-02rQSL+FsLcQm8rCFZbnLufNNjFyECSSnZkVgajDSbtHqVXdQ3COqgSM9u1UH3/RH3i4tjVcsfLDtUFaMxxmug==",
+      "requires": {
+        "js-yaml": "3.12.0",
+        "json5": "2.0.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.0.0.tgz",
+          "integrity": "sha512-0EdQvHuLm7yJ7lyG5dp7Q3X2ku++BG5ZHaJ5FTnaXpKqDrw4pMxel5Bt3oAYMthnrthFBdnZ1FcsXTPyrQlV0w==",
+          "requires": {
+            "minimist": "1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "iconv-lite": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
@@ -4790,7 +4831,6 @@
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
       "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-      "dev": true,
       "requires": {
         "argparse": "1.0.10",
         "esprima": "4.0.1"
diff --git a/package.json b/package.json
index 4a65b09b..bd85278c 100644
--- a/package.json
+++ b/package.json
@@ -47,11 +47,14 @@
     }
   },
   "dependencies": {
+    "@panter/vue-i18next": "^0.12.0",
     "bitsharesjs": "^1.8.0",
     "bootstrap-vue": "^2.0.0-rc.11",
     "electron-compile": "^6.4.3",
     "electron-devtools-installer": "^2.2.4",
     "electron-squirrel-startup": "^1.0.0",
+    "i18next": "^11.6.0",
+    "i18next-node-fs-backend": "^2.0.0",
     "secure-ls": "^1.2.1",
     "socket.io": "^2.1.1",
     "uuid": "^3.3.2",
diff --git a/src/components/create.vue b/src/components/create.vue
index 3860e94e..542903f8 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -27,7 +27,7 @@
                      v-model="includeOwner"
                      value="1"
                      unchecked-value="0" class="mb-3">
-      Include Owner Key
+      Include Owner Key?
     </b-form-checkbox>
     <div v-if="includeOwner==1">        
         <input type="text" id="inputOwner" class="form-control mb-3 small" placeholder="Owner Private Key" required=""  v-model="ownerpk">
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 0e11137a..1400feec 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -3,7 +3,7 @@
 <div class="content">
             <div class="row mb-2">
                 <div class="col-12 text-center account py-2">
-                      {{accountName}} ({{accountID}})
+                      {{accountName}} ({{accountID}})                      
                 </div>
             </div>
             <Balances ref="balancetable"></Balances>
@@ -67,6 +67,7 @@ import {
 
 export default {
   name: "dashboard",
+  i18nOptions: { namespaces: ["common","operations"] },
   data() {
     return {
       text: "",
@@ -89,6 +90,7 @@ export default {
     this.$refs.loaderAnimModal.show();
     BeetServer.initialize(this);
     BeetServer.open();
+    
   },
   methods: {
     getBalances: async function() {
diff --git a/src/components/header-guest.vue b/src/components/header-guest.vue
index 9def479d..201aa391 100644
--- a/src/components/header-guest.vue
+++ b/src/components/header-guest.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="top">
         <img class="mb-4" src="img/bitshares.png" alt="" width="150" height="150">
-        <h3 class="h3 mb-3 font-weight-normal">Welcome to <br/>Beet!</h3>
+        <h3 class="h3 mb-3 font-weight-normal">{{ $t("welcome" ) }}</h3>
     </div>
 </template>
 
 <script>
-export default {
-  name: "headerGuest",
+export default { 
+  name: "headerGuest",  
+  i18nOptions: { namespaces: "common" },
   data() {
     return {};
   }
diff --git a/src/config/i18n.js b/src/config/i18n.js
new file mode 100644
index 00000000..86942daf
--- /dev/null
+++ b/src/config/i18n.js
@@ -0,0 +1,9 @@
+export const defaultLocale = 'en'
+ 
+export const locales = [
+    {
+        code: 'en',
+        name: 'English',
+        dir: 'ltr',
+    }
+]
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index ad24afa8..1a19f9ea 100644
--- a/src/index.html
+++ b/src/index.html
@@ -17,18 +17,37 @@
         <router-view name="header"></router-view>
         <router-view></router-view>
     </div>
-    <script>        
+    <script>
         import Vue from 'vue/dist/vue.js';
         import BootstrapVue from 'bootstrap-vue';
         import VueRouter from 'vue-router';
         import store from './store/index.js';
-        import router from './router/index.js';        
+        import router from './router/index.js';
+        import i18next from 'i18next';
+        import Backend from "i18next-node-fs-backend";
 
+        import VueI18Next from '@panter/vue-i18next';
+        
+        Vue.use(VueI18Next);
         Vue.use(BootstrapVue);
-        Vue.use(VueRouter);        
+        Vue.use(VueRouter);
+
+        i18next.use(Backend).init({
+            lng: "en",
+            fallbackLng: "en",
+            ns: ['common', 'operations'],
+            defaultNS: 'common',
+            backend: {
+                loadPath: `${__dirname}/translations/{{ns}}/{{lng}}.json`,
+            }
+        });
+
+        store.dispatch("SettingsStore/loadSettings");
+        const i18n = new VueI18Next(i18next);
         const app = new Vue({
             router,
-            store
+            store,
+            i18n: i18n
         }).$mount('#app');
     </script>
 </body>
diff --git a/src/store/index.js b/src/store/index.js
index 0a4c0c3b..a0e64b54 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,12 +1,14 @@
 import Vue from 'vue/dist/vue.js';
 import Vuex from 'vuex';
 import BeetStore from './modules/BeetStore.js';
+import SettingsStore from './modules/SettingsStore.js';
 
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
     modules: {
-        BeetStore
+        BeetStore,
+        SettingsStore
     }
   });
 
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
new file mode 100644
index 00000000..69043ce6
--- /dev/null
+++ b/src/store/modules/SettingsStore.js
@@ -0,0 +1,49 @@
+import Vue from 'vue/dist/vue.js';
+const LOAD_SETTINGS = 'LOAD_SETTINGS';
+
+
+const mutations = {
+    [LOAD_SETTINGS](state, settings) {
+        Vue.set(state, 'settings', settings);
+    }
+};
+
+const actions = {
+    loadSettings({
+        commit
+    }) {
+        return new Promise((resolve, reject) => {
+            try  {
+                let settings=localStorage.getItem("settings");
+                if (settings && settings.length > 0) {
+                    commit(LOAD_SETTINGS, settings);
+                }else{
+                    localStorage.setItem("settings", JSON.stringify(initialState.settings));
+                }
+                resolve();
+            } catch (e) {
+                reject();
+            }
+        });
+    }
+}
+
+
+const getters = {
+};
+
+
+const initialState = {
+    'settings': {
+    'locale': 'en',
+    'selected_node': 'wss://bts-seoul.clockwork.gr'
+    }
+};
+
+export default {
+    namespaced: true,
+    state: initialState,
+    actions,
+    mutations,
+    getters,
+};
\ No newline at end of file
diff --git a/src/translations/common/en.json b/src/translations/common/en.json
new file mode 100644
index 00000000..fcf00ec7
--- /dev/null
+++ b/src/translations/common/en.json
@@ -0,0 +1,36 @@
+{
+    "app_name": "Beet",
+    "slogan": "The BitShares companion",
+    "welcome": "Welcome to Beet!",
+    "no_wallet": "There is no wallet stored in this computer.",
+    "start_cta": "Get Started",
+    "select_wallet": "Select Wallet:",
+    "password_placeholder": "Password",
+    "unlock_cta": "Unlock",
+    "create_cta": "Create a new Wallet",
+    "step_counter": "Step {{step_no}}",
+    "friendly_cta": "Set a friendly name for your new wallet:",
+    "walletname_placeholder": "Wallet Name",
+    "cancel_btn": "Cancel",
+    "next_btn": "Next",
+    "back_btn": "Back",
+    "account_name": "{{chain}} Account Name",
+    "keys_cta": "Please enter the private keys for your account below:",
+    "active_authority": "Active Authority",
+    "owner_authority": "Owner Authority",
+    "memo_authority": "Memo Authority",
+    "active_authority_placceholder": "Active Private Key",
+    "owner_authority_placeholder": "Owner Private Key",
+    "memo_authority_placeholder": "Memo Private Key",
+    "include_owner_check": "Include Owner Key?",
+    "password_cta": "Set a password for this wallet:",
+    "confirm_placeholder": "Confirm password",
+    "empty_wallet_error": "Can not create a wallet with an empty name.",
+    "duplicate_wallet_error": "A wallet with this name already exists.",
+    "missing_account_error": "You must specify your {{chain}} account name.",
+    "invalid_key_error": "Invalid Private key format.",
+    "unverified_account_error": "Could not verify keys for account name provided. Please check.",
+    "confirm_pass_error": "Passwords do not match.",
+    "balances_lbl": "Balances",
+    "node_lbl": "Node"
+}
\ No newline at end of file
diff --git a/src/translations/operations/en.json b/src/translations/operations/en.json
new file mode 100644
index 00000000..e7f90f55
--- /dev/null
+++ b/src/translations/operations/en.json
@@ -0,0 +1,20 @@
+{
+    "account_id": {
+        "request": "The page/app {{- origin}} is requesting to access your account ID.",
+        "request_cta": "Do you want to allow access?",
+        "accept_btn": "Allow",
+        "reject_btn": "Deny"
+    },
+    "rawsig": {
+        "request": "The page/app {{- origin}} has submitted the following transaction.",
+        "request_cta": "Do you want to execute it?",
+        "accept_btn": "Sign &amp; Broadcast",
+        "reject_btn": "Ignore"
+    },
+    "vote": {
+        "request": "The page/app {{- origin}} wants you to vote for the following {{entity}}",
+        "request_cta": "",
+        "accept_btn": "Approve",
+        "reject_btn": "Ignore"
+    }
+}
\ No newline at end of file

From a17ff9271949c8a7d71317cdb3f7190e4d5ca59d Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 00:20:06 +0300
Subject: [PATCH 02/35] Localised start.vue

---
 src/components/start.vue | 14 +++++++-------
 src/config/i18n.js       |  9 ---------
 2 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 src/config/i18n.js

diff --git a/src/components/start.vue b/src/components/start.vue
index 2c91bf9e..2e4182f5 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="bottom">
       <div class="content">
-        <p class="mt-3 mb-3 font-weight-normal" v-if="!hasWallet"><em>There is no wallet stored in this computer.</em></p>
-        <router-link to="/create" tag="button" v-if="!hasWallet" class="btn btn-lg btn-primary btn-block" replace>Get Started</router-link>        
+        <p class="mt-3 mb-3 font-weight-normal" v-if="!hasWallet"><em>{{ $t('no_wallet') }}</em></p>
+        <router-link to="/create" tag="button" v-if="!hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('start_cta') }}</router-link>        
         <select class="form-control my-3" id="wallet-select" v-model="selectedWallet"  v-if="hasWallet" v-on:change="passincorrect=''">                                
-          <option selected disabled value="0">Select Wallet:</option>
+          <option selected disabled value="0">{{ $t('select_wallet') }}</option>
           <option v-for="wallet in walletlist" v-bind:value="wallet.id" v-bind:key="wallet.id">{{wallet.name}}</option>
         </select>
-        <input type="password" id="inputPassword" class="form-control mb-3" placeholder="Password" required="" v-model="walletpass"  v-if="hasWallet" v-bind:class="passincorrect" v-on:focus="passincorrect=''">        
-        <button class="btn btn-lg btn-primary btn-block" type="submit" v-if="hasWallet" v-on:click="unlockWallet">Unlock</button>
-        <p class="my-2 font-weight-normal" v-if="hasWallet"><em>or</em></p>
-        <router-link to="/create" tag="button" v-if="hasWallet" class="btn btn-lg btn-primary btn-block" replace>Create a new wallet</router-link>     
+        <input type="password" id="inputPassword" class="form-control mb-3" placeholder="{{ $t('password_placeholder') }}" required="" v-model="walletpass"  v-if="hasWallet" v-bind:class="passincorrect" v-on:focus="passincorrect=''">        
+        <button class="btn btn-lg btn-primary btn-block" type="submit" v-if="hasWallet" v-on:click="unlockWallet">{{ $t('unlock_cta') }}</button>
+        <p class="my-2 font-weight-normal" v-if="hasWallet"><em>{{ $t('or') }}</em></p>
+        <router-link to="/create" tag="button" v-if="hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('create_cta') }}</router-link>     
         </div>
         <b-modal id="error" centered ref="errorModal"  hide-footer title="Error">
         {{errorMsg}}
diff --git a/src/config/i18n.js b/src/config/i18n.js
deleted file mode 100644
index 86942daf..00000000
--- a/src/config/i18n.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const defaultLocale = 'en'
- 
-export const locales = [
-    {
-        code: 'en',
-        name: 'English',
-        dir: 'ltr',
-    }
-]
\ No newline at end of file

From 6acfae46eb5935036d11e3633439d02f4f85f15b Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 00:22:23 +0300
Subject: [PATCH 03/35] fix attribute translation

---
 src/components/start.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/start.vue b/src/components/start.vue
index 2e4182f5..fd399f01 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -7,7 +7,7 @@
           <option selected disabled value="0">{{ $t('select_wallet') }}</option>
           <option v-for="wallet in walletlist" v-bind:value="wallet.id" v-bind:key="wallet.id">{{wallet.name}}</option>
         </select>
-        <input type="password" id="inputPassword" class="form-control mb-3" placeholder="{{ $t('password_placeholder') }}" required="" v-model="walletpass"  v-if="hasWallet" v-bind:class="passincorrect" v-on:focus="passincorrect=''">        
+        <input type="password" id="inputPassword" class="form-control mb-3" :placeholder=" $t('password_placeholder')" required="" v-model="walletpass"  v-if="hasWallet" v-bind:class="passincorrect" v-on:focus="passincorrect=''">        
         <button class="btn btn-lg btn-primary btn-block" type="submit" v-if="hasWallet" v-on:click="unlockWallet">{{ $t('unlock_cta') }}</button>
         <p class="my-2 font-weight-normal" v-if="hasWallet"><em>{{ $t('or') }}</em></p>
         <router-link to="/create" tag="button" v-if="hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('create_cta') }}</router-link>     

From d85342fab4eb0eea3912134017aef367e9b763c0 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 10:48:51 +0300
Subject: [PATCH 04/35] More strings replace with i18n calls

---
 package-lock.json               | 3965 +++++++++++++++++++------------
 src/components/balances.vue     |    3 +-
 src/components/create.vue       |   62 +-
 src/components/node-select.vue  |    3 +-
 src/components/start.vue        |    1 +
 src/translations/common/en.json |    7 +-
 6 files changed, 2421 insertions(+), 1620 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9df31401..293f841d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,14 +15,14 @@
       "integrity": "sha512-vJEHSTnI4UAbCDTjVSQljPeX81zsQVNj2ruM5Oj5gxOttHD0TcfWeElcJYoITCMxQTgN6Y+bJFo6/+/0CqoacA==",
       "dev": true,
       "requires": {
-        "before-after-hook": "1.1.0",
-        "btoa-lite": "1.0.0",
-        "debug": "3.1.0",
-        "http-proxy-agent": "2.1.0",
-        "https-proxy-agent": "2.2.1",
-        "lodash": "4.17.10",
-        "node-fetch": "2.2.0",
-        "url-template": "2.0.8"
+        "before-after-hook": "^1.1.0",
+        "btoa-lite": "^1.0.0",
+        "debug": "^3.1.0",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.0",
+        "lodash": "^4.17.4",
+        "node-fetch": "^2.1.1",
+        "url-template": "^2.0.8"
       },
       "dependencies": {
         "debug": {
@@ -41,7 +41,7 @@
       "resolved": "https://registry.npmjs.org/@panter/vue-i18next/-/vue-i18next-0.12.0.tgz",
       "integrity": "sha1-SHXDjUW36kzk6HbWCFQWEnuGa0Y=",
       "requires": {
-        "deepmerge": "2.1.1"
+        "deepmerge": "^2.0.0"
       }
     },
     "@paulcbetts/mime-db": {
@@ -54,7 +54,7 @@
       "resolved": "https://registry.npmjs.org/@paulcbetts/mime-types/-/mime-types-2.1.10.tgz",
       "integrity": "sha1-iqUx8faPrICELnmu/4Z5fDCSJ90=",
       "requires": {
-        "@paulcbetts/mime-db": "1.22.4"
+        "@paulcbetts/mime-db": "~1.22.0"
       }
     },
     "@paulcbetts/vueify": {
@@ -63,17 +63,17 @@
       "integrity": "sha1-NuLSO9fAGeit5I/IV/WjdkMeKlQ=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "convert-source-map": "1.5.1",
-        "cssnano": "3.10.0",
-        "hash-sum": "1.0.2",
-        "lru-cache": "4.1.3",
-        "object-assign": "4.1.1",
-        "source-map": "0.5.7",
-        "through": "2.3.8",
-        "vue-hot-reload-api": "2.3.0",
-        "vue-template-compiler": "2.5.17",
-        "vue-template-es2015-compiler": "1.6.0"
+        "chalk": "^1.1.1",
+        "convert-source-map": "^1.2.0",
+        "cssnano": "^3.3.2",
+        "hash-sum": "^1.0.2",
+        "lru-cache": "^4.0.0",
+        "object-assign": "^4.0.1",
+        "source-map": "^0.5.6",
+        "through": "^2.3.6",
+        "vue-hot-reload-api": "^2.0.1",
+        "vue-template-compiler": "^2.0.0-alpha.8",
+        "vue-template-es2015-compiler": "^1.4.2"
       }
     },
     "@types/node": {
@@ -99,7 +99,7 @@
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "requires": {
-        "mime-types": "2.1.19",
+        "mime-types": "~2.1.18",
         "negotiator": "0.6.1"
       }
     },
@@ -115,7 +115,7 @@
       "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
       "dev": true,
       "requires": {
-        "acorn": "2.7.0"
+        "acorn": "^2.1.0"
       }
     },
     "after": {
@@ -129,7 +129,7 @@
       "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
       "dev": true,
       "requires": {
-        "es6-promisify": "5.0.0"
+        "es6-promisify": "^5.0.0"
       }
     },
     "ajv": {
@@ -138,10 +138,10 @@
       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "dev": true,
       "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.1.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
       }
     },
     "align-text": {
@@ -150,9 +150,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
       }
     },
     "alphanum-sort": {
@@ -194,6 +194,66 @@
       "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
       "dev": true
     },
+    "appdmg": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/appdmg/-/appdmg-0.4.5.tgz",
+      "integrity": "sha1-R6gnhluKC+SKuzUiVn40k9LxuDg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "^1.4.2",
+        "cp-file": "^3.1.0",
+        "ds-store": "^0.1.5",
+        "execa": "^0.4.0",
+        "fs-temp": "^1.0.0",
+        "fs-xattr": "^0.1.14",
+        "image-size": "^0.5.0",
+        "is-my-json-valid": "^2.13.1",
+        "minimist": "^1.1.3",
+        "parse-color": "^1.0.0",
+        "repeat-string": "^1.5.4"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz",
+          "integrity": "sha1-TrZGejaglfq7KXD/nV4/t7zm68M=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "cross-spawn-async": "^2.1.1",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "path-key": "^1.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true,
+          "optional": true
+        },
+        "npm-run-path": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz",
+          "integrity": "sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "path-key": "^1.0.0"
+          }
+        },
+        "path-key": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
+          "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=",
+          "dev": true
+        }
+      }
+    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -206,14 +266,14 @@
       "integrity": "sha1-mBd9p6bAGSt/J5jzDNbquKvXZpA=",
       "dev": true,
       "requires": {
-        "async": "0.9.2",
-        "buffer-crc32": "0.2.13",
-        "glob": "3.2.11",
-        "lazystream": "0.1.0",
-        "lodash": "2.4.2",
-        "readable-stream": "1.0.34",
-        "tar-stream": "0.4.7",
-        "zip-stream": "0.4.1"
+        "async": "~0.9.0",
+        "buffer-crc32": "~0.2.1",
+        "glob": "~3.2.6",
+        "lazystream": "~0.1.0",
+        "lodash": "~2.4.1",
+        "readable-stream": "~1.0.26",
+        "tar-stream": "~0.4.0",
+        "zip-stream": "~0.4.0"
       },
       "dependencies": {
         "async": {
@@ -228,8 +288,8 @@
           "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3",
-            "minimatch": "0.3.0"
+            "inherits": "2",
+            "minimatch": "0.3"
           }
         },
         "isarray": {
@@ -256,8 +316,8 @@
           "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
           "dev": true,
           "requires": {
-            "lru-cache": "2.7.3",
-            "sigmund": "1.0.1"
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
           }
         },
         "readable-stream": {
@@ -266,10 +326,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
@@ -280,8 +340,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.6"
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       },
       "dependencies": {
         "readable-stream": {
@@ -290,13 +350,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.2",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -305,7 +365,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -315,9 +375,16 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
+    "array-buffer-from-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-from-string/-/array-buffer-from-string-0.1.0.tgz",
+      "integrity": "sha1-OxQ1H4YUnYTvxhLFrafthRadewc=",
+      "dev": true,
+      "optional": true
+    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -341,13 +408,13 @@
       "integrity": "sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==",
       "dev": true,
       "requires": {
-        "chromium-pickle-js": "0.2.0",
-        "commander": "2.17.1",
-        "cuint": "0.2.2",
-        "glob": "6.0.4",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "mksnapshot": "0.3.1",
+        "chromium-pickle-js": "^0.2.0",
+        "commander": "^2.9.0",
+        "cuint": "^0.2.1",
+        "glob": "^6.0.4",
+        "minimatch": "^3.0.3",
+        "mkdirp": "^0.5.0",
+        "mksnapshot": "^0.3.0",
         "tmp": "0.0.28"
       },
       "dependencies": {
@@ -357,11 +424,11 @@
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -372,7 +439,7 @@
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": "~2.1.0"
       }
     },
     "assert-plus": {
@@ -409,12 +476,12 @@
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
       "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000875",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "browserslist": "^1.7.6",
+        "caniuse-db": "^1.0.30000634",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^5.2.16",
+        "postcss-value-parser": "^3.2.3"
       },
       "dependencies": {
         "browserslist": {
@@ -422,8 +489,8 @@
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "requires": {
-            "caniuse-db": "1.0.30000875",
-            "electron-to-chromium": "1.3.56"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         }
       }
@@ -471,9 +538,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       }
     },
     "babel-core": {
@@ -482,25 +549,25 @@
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.5.1",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.10",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
       }
     },
     "babel-generator": {
@@ -509,14 +576,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.10",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
       },
       "dependencies": {
         "jsesc": {
@@ -533,9 +600,9 @@
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-builder-react-jsx": {
@@ -544,9 +611,9 @@
       "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "esutils": "2.0.2"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "esutils": "^2.0.2"
       }
     },
     "babel-helper-call-delegate": {
@@ -555,10 +622,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-define-map": {
@@ -567,10 +634,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -579,9 +646,9 @@
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-function-name": {
@@ -590,11 +657,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-get-function-arity": {
@@ -603,8 +670,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-hoist-variables": {
@@ -613,8 +680,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -623,8 +690,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-regex": {
@@ -633,9 +700,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -644,11 +711,11 @@
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-replace-supers": {
@@ -657,12 +724,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helpers": {
@@ -671,8 +738,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-messages": {
@@ -681,7 +748,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-add-module-exports": {
@@ -701,7 +768,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -752,9 +819,9 @@
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -763,7 +830,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -772,7 +839,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -781,11 +848,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.10"
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -794,15 +861,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "6.26.0",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -811,8 +878,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -821,7 +888,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -830,8 +897,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -840,7 +907,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -849,9 +916,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -860,7 +927,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -869,9 +936,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -880,10 +947,10 @@
       "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -892,9 +959,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -903,9 +970,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -914,8 +981,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.26.0"
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -924,12 +991,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -938,8 +1005,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -948,7 +1015,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -957,9 +1024,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -968,7 +1035,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -977,7 +1044,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -986,9 +1053,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "regexpu-core": "2.0.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
       }
     },
     "babel-plugin-transform-exponentiation-operator": {
@@ -997,9 +1064,9 @@
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-flow-strip-types": {
@@ -1008,8 +1075,8 @@
       "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-flow": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-flow": "^6.18.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-object-rest-spread": {
@@ -1018,8 +1085,8 @@
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-object-rest-spread": "6.13.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
       }
     },
     "babel-plugin-transform-react-display-name": {
@@ -1028,7 +1095,7 @@
       "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx": {
@@ -1037,9 +1104,9 @@
       "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-react-jsx": "6.26.0",
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-helper-builder-react-jsx": "^6.24.1",
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx-self": {
@@ -1048,8 +1115,8 @@
       "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-react-jsx-source": {
@@ -1058,8 +1125,8 @@
       "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.26.0"
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-regenerator": {
@@ -1068,7 +1135,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.10.1"
+        "regenerator-transform": "^0.10.0"
       }
     },
     "babel-plugin-transform-strict-mode": {
@@ -1077,8 +1144,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-polyfill": {
@@ -1086,9 +1153,9 @@
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
       "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
       "requires": {
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.7",
-        "regenerator-runtime": "0.10.5"
+        "babel-runtime": "^6.22.0",
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.10.0"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -1104,36 +1171,36 @@
       "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "3.2.8",
-        "invariant": "2.2.4",
-        "semver": "5.5.0"
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+        "babel-plugin-transform-es2015-classes": "^6.23.0",
+        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+        "babel-plugin-transform-es2015-for-of": "^6.23.0",
+        "babel-plugin-transform-es2015-function-name": "^6.22.0",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+        "babel-plugin-transform-es2015-object-super": "^6.22.0",
+        "babel-plugin-transform-es2015-parameters": "^6.23.0",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+        "babel-plugin-transform-regenerator": "^6.22.0",
+        "browserslist": "^3.2.6",
+        "invariant": "^2.2.2",
+        "semver": "^5.3.0"
       }
     },
     "babel-preset-es2016-node5": {
@@ -1142,15 +1209,15 @@
       "integrity": "sha1-XsQ9LYv0HVMVgEdAzDjw3eqyaYY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-plugin-syntax-async-generators": "6.13.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1"
+        "babel-plugin-syntax-async-functions": "^6.1.4",
+        "babel-plugin-syntax-async-generators": "^6.1.4",
+        "babel-plugin-transform-async-to-generator": "^6.1.4",
+        "babel-plugin-transform-es2015-destructuring": "^6.0.2",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.0.12",
+        "babel-plugin-transform-es2015-parameters": "^6.0.2",
+        "babel-plugin-transform-es2015-spread": "^6.1.4",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.0.2",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.0.2"
       }
     },
     "babel-preset-flow": {
@@ -1159,7 +1226,7 @@
       "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-flow-strip-types": "6.22.0"
+        "babel-plugin-transform-flow-strip-types": "^6.22.0"
       }
     },
     "babel-preset-react": {
@@ -1168,12 +1235,12 @@
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-plugin-transform-react-display-name": "6.25.0",
-        "babel-plugin-transform-react-jsx": "6.24.1",
-        "babel-plugin-transform-react-jsx-self": "6.22.0",
-        "babel-plugin-transform-react-jsx-source": "6.22.0",
-        "babel-preset-flow": "6.23.0"
+        "babel-plugin-syntax-jsx": "^6.3.13",
+        "babel-plugin-transform-react-display-name": "^6.23.0",
+        "babel-plugin-transform-react-jsx": "^6.24.1",
+        "babel-plugin-transform-react-jsx-self": "^6.22.0",
+        "babel-plugin-transform-react-jsx-source": "^6.22.0",
+        "babel-preset-flow": "^6.23.0"
       }
     },
     "babel-register": {
@@ -1182,13 +1249,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.3",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.7",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.10",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
       }
     },
     "babel-runtime": {
@@ -1196,8 +1263,8 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.7",
-        "regenerator-runtime": "0.11.1"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
     "babel-template": {
@@ -1206,11 +1273,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.10"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-traverse": {
@@ -1219,15 +1286,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.4",
-        "lodash": "4.17.10"
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
       }
     },
     "babel-types": {
@@ -1236,10 +1303,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.10",
-        "to-fast-properties": "1.0.3"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       }
     },
     "babylon": {
@@ -1263,9 +1330,16 @@
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.4.tgz",
       "integrity": "sha512-UYOadoSIkEI/VrRGSG6qp93rp2WdokiAiNYDfGW5qURAY8GiAQkvMbwNNSDYiVJopqv4gCna7xqf4rrNGp+5AA==",
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "^5.0.1"
       }
     },
+    "base32-encode": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/base32-encode/-/base32-encode-0.1.1.tgz",
+      "integrity": "sha512-jjc+6TC8PXrsxJ4CQr9ibioNhhAM1p/RvS9hy3Q+cxPphvXmLnFSkXoen2XXzNBrYjdmzajRtbFDl1x28F5F4A==",
+      "dev": true,
+      "optional": true
+    },
     "base64-arraybuffer": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
@@ -1289,7 +1363,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "before-after-hook": {
@@ -1317,8 +1391,8 @@
       "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
       "dev": true,
       "requires": {
-        "buffers": "0.1.1",
-        "chainsaw": "0.1.0"
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
       }
     },
     "bitsharesjs": {
@@ -1337,7 +1411,7 @@
         "ecurve": "1.0.6",
         "event-emitter": "0.3.5",
         "immutable": "3.8.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "^5.1.2",
         "secure-random": "1.1.1"
       }
     },
@@ -1346,7 +1420,7 @@
       "resolved": "https://registry.npmjs.org/bitsharesjs-ws/-/bitsharesjs-ws-1.5.4.tgz",
       "integrity": "sha512-34JYCgcEwJzA6L8EBIJ4SNAkiWy8vj3OrJHw6/OHYr4+ARctgkpDeHoPms0j6zqV4cIkR5X4RZdctnsm0aNH9Q==",
       "requires": {
-        "babel-plugin-add-module-exports": "0.2.1",
+        "babel-plugin-add-module-exports": "^0.2.1",
         "ws": "4.1.0"
       },
       "dependencies": {
@@ -1355,8 +1429,8 @@
           "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
           "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
           "requires": {
-            "async-limiter": "1.0.0",
-            "safe-buffer": "5.1.2"
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -1367,7 +1441,7 @@
       "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.0.34"
+        "readable-stream": "~1.0.26"
       },
       "dependencies": {
         "isarray": {
@@ -1382,10 +1456,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
@@ -1401,7 +1475,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "~2.0.0"
       }
     },
     "bluebird": {
@@ -1422,7 +1496,7 @@
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "2.x.x"
       }
     },
     "bootstrap": {
@@ -1435,12 +1509,22 @@
       "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.11.tgz",
       "integrity": "sha512-LxR+oL8yKr1DVoWUWTX+XhiT0xaTMH6142u2VSFDm4tewTH8HIrzN2YIl7HLZrw2DIuE9bRMIdWJqqn3aQe7Hw==",
       "requires": {
-        "bootstrap": "4.1.3",
-        "lodash.get": "4.4.2",
-        "lodash.startcase": "4.4.0",
-        "opencollective": "1.0.3",
-        "popper.js": "1.14.4",
-        "vue-functional-data-merge": "2.0.6"
+        "bootstrap": "^4.1.1",
+        "lodash.get": "^4.4.2",
+        "lodash.startcase": "^4.4.0",
+        "opencollective": "^1.0.3",
+        "popper.js": "^1.12.9",
+        "vue-functional-data-merge": "^2.0.5"
+      }
+    },
+    "bplist-creator": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
+      "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "stream-buffers": "~2.2.0"
       }
     },
     "brace-expansion": {
@@ -1448,7 +1532,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1458,8 +1542,8 @@
       "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000874",
-        "electron-to-chromium": "1.3.56"
+        "caniuse-lite": "^1.0.30000844",
+        "electron-to-chromium": "^1.3.47"
       }
     },
     "bs58": {
@@ -1467,7 +1551,7 @@
       "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
       "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
       "requires": {
-        "base-x": "3.0.4"
+        "base-x": "^3.0.2"
       }
     },
     "btoa": {
@@ -1487,9 +1571,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.3.0",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-alloc": {
@@ -1498,8 +1582,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "1.1.0",
-        "buffer-fill": "1.0.0"
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -1520,6 +1604,13 @@
       "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
       "dev": true
     },
+    "buffer-from": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz",
+      "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==",
+      "dev": true,
+      "optional": true
+    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -1536,7 +1627,7 @@
       "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
       "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
       "requires": {
-        "long": "3.2.0"
+        "long": "~3"
       }
     },
     "callsite": {
@@ -1555,8 +1646,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -1572,10 +1663,10 @@
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
       "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000875",
-        "lodash.memoize": "4.1.2",
-        "lodash.uniq": "4.5.0"
+        "browserslist": "^1.3.6",
+        "caniuse-db": "^1.0.30000529",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
       },
       "dependencies": {
         "browserslist": {
@@ -1583,8 +1674,8 @@
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "requires": {
-            "caniuse-db": "1.0.30000875",
-            "electron-to-chromium": "1.3.56"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         }
       }
@@ -1612,8 +1703,8 @@
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
       }
     },
     "chainsaw": {
@@ -1622,7 +1713,7 @@
       "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
       "dev": true,
       "requires": {
-        "traverse": "0.3.9"
+        "traverse": ">=0.3.0 <0.4"
       }
     },
     "chalk": {
@@ -1630,11 +1721,11 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       }
     },
     "character-parser": {
@@ -1654,12 +1745,12 @@
       "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
       "dev": true,
       "requires": {
-        "css-select": "1.2.0",
-        "dom-serializer": "0.1.0",
-        "entities": "1.1.1",
-        "htmlparser2": "3.8.3",
-        "jsdom": "7.2.2",
-        "lodash": "4.17.10"
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "~3.8.1",
+        "jsdom": "^7.0.2",
+        "lodash": "^4.1.0"
       }
     },
     "chromium-pickle-js": {
@@ -1673,8 +1764,8 @@
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "clap": {
@@ -1682,7 +1773,7 @@
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
       "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
       "requires": {
-        "chalk": "1.1.3"
+        "chalk": "^1.1.3"
       }
     },
     "clean-css": {
@@ -1691,8 +1782,8 @@
       "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
       "dev": true,
       "requires": {
-        "commander": "2.8.1",
-        "source-map": "0.4.4"
+        "commander": "2.8.x",
+        "source-map": "0.4.x"
       },
       "dependencies": {
         "commander": {
@@ -1701,7 +1792,7 @@
           "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
           "dev": true,
           "requires": {
-            "graceful-readlink": "1.0.1"
+            "graceful-readlink": ">= 1.0.0"
           }
         },
         "source-map": {
@@ -1710,7 +1801,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -1720,7 +1811,7 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "requires": {
-        "restore-cursor": "2.0.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-spinners": {
@@ -1739,9 +1830,9 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
@@ -1760,7 +1851,7 @@
       "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
       "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
       "requires": {
-        "q": "1.5.1"
+        "q": "^1.1.2"
       }
     },
     "code-point-at": {
@@ -1779,9 +1870,9 @@
       "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
       "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
       "requires": {
-        "clone": "1.0.4",
-        "color-convert": "1.9.2",
-        "color-string": "0.3.0"
+        "clone": "^1.0.2",
+        "color-convert": "^1.3.0",
+        "color-string": "^0.3.0"
       }
     },
     "color-convert": {
@@ -1802,7 +1893,7 @@
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
       "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
       "requires": {
-        "color-name": "1.1.1"
+        "color-name": "^1.0.0"
       }
     },
     "colormin": {
@@ -1810,9 +1901,9 @@
       "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
       "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
       "requires": {
-        "color": "0.11.4",
+        "color": "^0.11.0",
         "css-color-names": "0.0.4",
-        "has": "1.0.3"
+        "has": "^1.0.1"
       }
     },
     "colors": {
@@ -1827,7 +1918,7 @@
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -1863,9 +1954,9 @@
       "integrity": "sha1-DHQIcP3ljLpRbwrAyCLjOguF36M=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "crc32-stream": "0.3.4",
-        "readable-stream": "1.0.34"
+        "buffer-crc32": "~0.2.1",
+        "crc32-stream": "~0.3.1",
+        "readable-stream": "~1.0.26"
       },
       "dependencies": {
         "isarray": {
@@ -1880,10 +1971,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
@@ -1899,10 +1990,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "typedarray": "0.0.6"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       },
       "dependencies": {
         "buffer-from": {
@@ -1917,13 +2008,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.2",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -1932,7 +2023,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -1949,7 +2040,7 @@
       "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=",
       "dev": true,
       "requires": {
-        "acorn": "2.7.0"
+        "acorn": "^2.1.0"
       }
     },
     "convert-source-map": {
@@ -1973,14 +2064,58 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "cp-file": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-3.2.0.tgz",
+      "integrity": "sha1-b4NhYlRiTwrViqSqjQdvAmvn4Yg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nested-error-stacks": "^1.0.1",
+        "object-assign": "^4.0.1",
+        "pify": "^2.3.0",
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.1.4"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "crc32-stream": {
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
       "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "readable-stream": "1.0.34"
+        "buffer-crc32": "~0.2.1",
+        "readable-stream": "~1.0.24"
       },
       "dependencies": {
         "isarray": {
@@ -1995,10 +2130,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
@@ -2008,11 +2143,11 @@
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "md5.js": "1.3.4",
-        "ripemd160": "2.0.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
     "create-hmac": {
@@ -2020,12 +2155,12 @@
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "cross-spawn": {
@@ -2034,9 +2169,20 @@
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.3",
-        "shebang-command": "1.2.0",
-        "which": "1.3.1"
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "cross-spawn-async": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz",
+      "integrity": "sha1-hF/wwINKPe2dFg2sptOQkGuyiMw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lru-cache": "^4.0.0",
+        "which": "^1.2.8"
       }
     },
     "cross-spawn-promise": {
@@ -2045,7 +2191,7 @@
       "integrity": "sha1-25y0xQxgtyoVvgSbeBIs44LYexA=",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0"
+        "cross-spawn": "^5.1.0"
       }
     },
     "cross-unzip": {
@@ -2060,7 +2206,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "2.x.x"
       }
     },
     "crypto-js": {
@@ -2074,11 +2220,11 @@
       "integrity": "sha1-g+6Qids8JUvsHpjkmNmqzxGtzFQ=",
       "dev": true,
       "requires": {
-        "coffee-script": "1.12.7",
-        "cson-parser": "1.3.5",
-        "extract-opts": "3.3.1",
-        "requirefresh": "2.1.0",
-        "safefs": "4.1.0"
+        "coffee-script": "^1.9.0",
+        "cson-parser": "^1.0.6",
+        "extract-opts": "^3.0.1",
+        "requirefresh": "^2.0.0",
+        "safefs": "^4.0.0"
       }
     },
     "cson-parser": {
@@ -2087,7 +2233,7 @@
       "integrity": "sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ=",
       "dev": true,
       "requires": {
-        "coffee-script": "1.12.7"
+        "coffee-script": "^1.10.0"
       }
     },
     "css": {
@@ -2117,10 +2263,10 @@
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
-        "boolbase": "1.0.0",
-        "css-what": "2.1.0",
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
         "domutils": "1.5.1",
-        "nth-check": "1.0.1"
+        "nth-check": "~1.0.1"
       }
     },
     "css-stringify": {
@@ -2140,38 +2286,38 @@
       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
       "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
       "requires": {
-        "autoprefixer": "6.7.7",
-        "decamelize": "1.2.0",
-        "defined": "1.0.0",
-        "has": "1.0.3",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-calc": "5.3.1",
-        "postcss-colormin": "2.2.2",
-        "postcss-convert-values": "2.6.1",
-        "postcss-discard-comments": "2.0.4",
-        "postcss-discard-duplicates": "2.1.0",
-        "postcss-discard-empty": "2.1.0",
-        "postcss-discard-overridden": "0.1.1",
-        "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.3",
-        "postcss-merge-idents": "2.1.7",
-        "postcss-merge-longhand": "2.0.2",
-        "postcss-merge-rules": "2.1.2",
-        "postcss-minify-font-values": "1.0.5",
-        "postcss-minify-gradients": "1.0.5",
-        "postcss-minify-params": "1.2.2",
-        "postcss-minify-selectors": "2.1.1",
-        "postcss-normalize-charset": "1.1.1",
-        "postcss-normalize-url": "3.0.8",
-        "postcss-ordered-values": "2.2.3",
-        "postcss-reduce-idents": "2.4.0",
-        "postcss-reduce-initial": "1.0.1",
-        "postcss-reduce-transforms": "1.0.4",
-        "postcss-svgo": "2.1.6",
-        "postcss-unique-selectors": "2.0.2",
-        "postcss-value-parser": "3.3.0",
-        "postcss-zindex": "2.2.0"
+        "autoprefixer": "^6.3.1",
+        "decamelize": "^1.1.2",
+        "defined": "^1.0.0",
+        "has": "^1.0.1",
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.14",
+        "postcss-calc": "^5.2.0",
+        "postcss-colormin": "^2.1.8",
+        "postcss-convert-values": "^2.3.4",
+        "postcss-discard-comments": "^2.0.4",
+        "postcss-discard-duplicates": "^2.0.1",
+        "postcss-discard-empty": "^2.0.1",
+        "postcss-discard-overridden": "^0.1.1",
+        "postcss-discard-unused": "^2.2.1",
+        "postcss-filter-plugins": "^2.0.0",
+        "postcss-merge-idents": "^2.1.5",
+        "postcss-merge-longhand": "^2.0.1",
+        "postcss-merge-rules": "^2.0.3",
+        "postcss-minify-font-values": "^1.0.2",
+        "postcss-minify-gradients": "^1.0.1",
+        "postcss-minify-params": "^1.0.4",
+        "postcss-minify-selectors": "^2.0.4",
+        "postcss-normalize-charset": "^1.1.0",
+        "postcss-normalize-url": "^3.0.7",
+        "postcss-ordered-values": "^2.1.0",
+        "postcss-reduce-idents": "^2.2.2",
+        "postcss-reduce-initial": "^1.0.0",
+        "postcss-reduce-transforms": "^1.0.3",
+        "postcss-svgo": "^2.1.1",
+        "postcss-unique-selectors": "^2.0.2",
+        "postcss-value-parser": "^3.2.3",
+        "postcss-zindex": "^2.0.1"
       }
     },
     "csso": {
@@ -2179,8 +2325,8 @@
       "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
       "requires": {
-        "clap": "1.2.3",
-        "source-map": "0.5.7"
+        "clap": "^1.0.9",
+        "source-map": "^0.5.3"
       }
     },
     "cssom": {
@@ -2196,7 +2342,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "cssom": "0.3.4"
+        "cssom": "0.3.x"
       }
     },
     "cuint": {
@@ -2211,7 +2357,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "1.0.2"
+        "array-find-index": "^1.0.1"
       }
     },
     "d": {
@@ -2219,7 +2365,7 @@
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "requires": {
-        "es5-ext": "0.10.45"
+        "es5-ext": "^0.10.9"
       }
     },
     "dashdash": {
@@ -2228,7 +2374,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "de-indent": {
@@ -2255,12 +2401,12 @@
       "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
       "dev": true,
       "requires": {
-        "binary": "0.3.0",
-        "graceful-fs": "4.1.11",
-        "mkpath": "0.1.0",
-        "nopt": "3.0.6",
-        "q": "1.5.1",
-        "readable-stream": "1.1.14",
+        "binary": "^0.3.0",
+        "graceful-fs": "^4.1.3",
+        "mkpath": "^0.1.0",
+        "nopt": "^3.0.1",
+        "q": "^1.1.2",
+        "readable-stream": "^1.1.8",
         "touch": "0.0.3"
       }
     },
@@ -2292,7 +2438,7 @@
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
       "requires": {
-        "clone": "1.0.4"
+        "clone": "^1.0.2"
       }
     },
     "defined": {
@@ -2318,7 +2464,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "detect-libc": {
@@ -2333,9 +2479,9 @@
       "integrity": "sha512-xeFzlSFHChKSvDGBg/gL5K7RHB4x/xXk5PmVuOek3tIYi4tZaVpUKIkCDTY1ndOt4FVcgGd51DSn7Y/DYvCqDw==",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
+        "debug": "^3.1.0",
+        "gonzales-pe": "^3.4.4",
+        "node-source-walk": "^3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -2355,9 +2501,9 @@
       "integrity": "sha1-BWYKoblc/Yf1dGQ7+s4+iiaBEqE=",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
+        "debug": "^3.1.0",
+        "gonzales-pe": "^3.4.4",
+        "node-source-walk": "^3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -2377,9 +2523,9 @@
       "integrity": "sha1-dDJGoN01jZ2R/0ElQX9qd/vPJw8=",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
+        "debug": "^3.1.0",
+        "gonzales-pe": "^3.4.4",
+        "node-source-walk": "^3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -2405,8 +2551,8 @@
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -2429,7 +2575,7 @@
       "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.3.0"
+        "domelementtype": "1"
       }
     },
     "domutils": {
@@ -2438,8 +2584,20 @@
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
-        "dom-serializer": "0.1.0",
-        "domelementtype": "1.3.0"
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "ds-store": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ds-store/-/ds-store-0.1.6.tgz",
+      "integrity": "sha1-0QJO90btDBPw9/7IXH6FjoxLfKc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bplist-creator": "~0.0.3",
+        "macos-alias": "~0.2.5",
+        "tn1150": "^0.1.0"
       }
     },
     "eachr": {
@@ -2448,8 +2606,8 @@
       "integrity": "sha1-LDXkPqCGUW95l8+At6pk1VpKRIQ=",
       "dev": true,
       "requires": {
-        "editions": "1.3.4",
-        "typechecker": "4.5.0"
+        "editions": "^1.1.1",
+        "typechecker": "^4.3.0"
       }
     },
     "ecc-jsbn": {
@@ -2459,8 +2617,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "ecurve": {
@@ -2468,8 +2626,8 @@
       "resolved": "https://registry.npmjs.org/ecurve/-/ecurve-1.0.6.tgz",
       "integrity": "sha512-/BzEjNfiSuB7jIWKcS/z8FK9jNjmEWvUV2YZ4RLSmcDtP7Lq0m6FvDuSnJpBlDpGRpfRQeTLGLBI8H+kEv0r+w==",
       "requires": {
-        "bigi": "1.4.2",
-        "safe-buffer": "5.1.2"
+        "bigi": "^1.1.0",
+        "safe-buffer": "^5.0.1"
       }
     },
     "editions": {
@@ -2483,17 +2641,17 @@
       "resolved": "https://registry.npmjs.org/electron-compile/-/electron-compile-6.4.3.tgz",
       "integrity": "sha512-xzKLcbznK+WsQmp7K0h/rNxCxAFofePYIaptuZHTZNyNzDwQxUPbJRYaSkWllKLQIur5GiAsa7Ixbr5vm8Y53A==",
       "requires": {
-        "@paulcbetts/mime-types": "2.1.10",
-        "@types/node": "7.0.69",
-        "btoa": "1.2.1",
-        "debug": "2.6.9",
-        "lru-cache": "4.1.3",
-        "mkdirp": "0.5.1",
-        "pify": "2.3.0",
-        "rimraf": "2.6.2",
-        "rxjs": "5.5.11",
-        "spawn-rx": "2.0.12",
-        "yargs": "4.8.1"
+        "@paulcbetts/mime-types": "^2.1.10",
+        "@types/node": "^7.0.12",
+        "btoa": "^1.1.2",
+        "debug": "^2.5.1",
+        "lru-cache": "^4.0.1",
+        "mkdirp": "^0.5.1",
+        "pify": "^2.3.0",
+        "rimraf": "^2.5.4",
+        "rxjs": "^5.1.1",
+        "spawn-rx": "^2.0.3",
+        "yargs": "^4.8.1"
       }
     },
     "electron-compilers": {
@@ -2502,36 +2660,36 @@
       "integrity": "sha1-lT3BTiT7FbN9XpDeLDnXU/P4FA4=",
       "dev": true,
       "requires": {
-        "@paulcbetts/mime-types": "2.1.10",
+        "@paulcbetts/mime-types": "^2.1.10",
         "@paulcbetts/vueify": "9.4.3",
-        "babel-core": "6.26.3",
-        "babel-preset-env": "1.7.0",
-        "btoa": "1.2.1",
-        "cheerio": "0.20.0",
-        "coffee-script": "1.12.7",
-        "cson": "3.0.2",
-        "debug": "2.6.9",
-        "detective-less": "1.0.1",
-        "detective-sass": "2.0.1",
-        "detective-scss": "1.0.1",
-        "detective-stylus": "1.0.0",
-        "graphql": "0.9.6",
-        "graphql-tag": "2.9.2",
-        "istanbul": "0.4.5",
-        "jade": "1.11.0",
-        "js-string-escape": "1.0.1",
-        "less": "2.7.3",
-        "mkdirp": "0.5.1",
-        "nib": "1.1.2",
-        "resolve": "1.8.1",
-        "rimraf": "2.6.2",
-        "sass-lookup": "1.1.0",
-        "sass.js": "0.10.10",
-        "sorcery": "0.10.0",
-        "stylus": "0.54.5",
-        "stylus-lookup": "1.0.2",
-        "toutsuite": "0.6.0",
-        "typescript": "3.0.1"
+        "babel-core": "^6.13.2",
+        "babel-preset-env": "^1.3.2",
+        "btoa": "^1.1.2",
+        "cheerio": "^0.20.0",
+        "coffee-script": "^1.10.0",
+        "cson": "^3.0.2",
+        "debug": "^2.5.1",
+        "detective-less": "^1.0.0",
+        "detective-sass": "^2.0.0",
+        "detective-scss": "^1.0.0",
+        "detective-stylus": "^1.0.0",
+        "graphql": "^0.9.3",
+        "graphql-tag": "^2.0.0",
+        "istanbul": "^0.4.5",
+        "jade": "^1.11.0",
+        "js-string-escape": "^1.0.1",
+        "less": "^2.7.1",
+        "mkdirp": "^0.5.1",
+        "nib": "^1.1.2",
+        "resolve": "^1.2.0",
+        "rimraf": "^2.5.4",
+        "sass-lookup": "^1.0.2",
+        "sass.js": "^0.10.1",
+        "sorcery": "^0.10.0",
+        "stylus": "^0.54.5",
+        "stylus-lookup": "^1.0.1",
+        "toutsuite": "^0.6.0",
+        "typescript": ">=1.6"
       }
     },
     "electron-devtools-installer": {
@@ -2541,8 +2699,8 @@
       "requires": {
         "7zip": "0.0.6",
         "cross-unzip": "0.0.2",
-        "rimraf": "2.6.2",
-        "semver": "5.5.0"
+        "rimraf": "^2.5.2",
+        "semver": "^5.3.0"
       }
     },
     "electron-download": {
@@ -2551,15 +2709,15 @@
       "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "env-paths": "1.0.0",
-        "fs-extra": "2.1.2",
-        "minimist": "1.2.0",
-        "nugget": "2.0.1",
-        "path-exists": "3.0.0",
-        "rc": "1.2.8",
-        "semver": "5.5.0",
-        "sumchecker": "2.0.2"
+        "debug": "^2.2.0",
+        "env-paths": "^1.0.0",
+        "fs-extra": "^2.0.0",
+        "minimist": "^1.2.0",
+        "nugget": "^2.0.0",
+        "path-exists": "^3.0.0",
+        "rc": "^1.1.2",
+        "semver": "^5.3.0",
+        "sumchecker": "^2.0.1"
       },
       "dependencies": {
         "fs-extra": {
@@ -2568,8 +2726,8 @@
           "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0"
           }
         },
         "minimist": {
@@ -2592,49 +2750,52 @@
       "integrity": "sha1-XZAQQgYZA1F7oKR3waGBifdX7pk=",
       "dev": true,
       "requires": {
-        "@octokit/rest": "15.9.5",
-        "aws-sdk": "2.290.0",
-        "babel-register": "6.26.0",
-        "bluebird": "3.5.1",
-        "colors": "1.3.1",
-        "commander": "2.17.1",
-        "cross-spawn-promise": "0.10.1",
-        "debug": "3.1.0",
-        "electron-forge-template-angular2": "1.0.6",
-        "electron-forge-template-react": "1.0.4",
-        "electron-forge-template-react-typescript": "1.0.6",
-        "electron-forge-template-vue": "1.0.3",
-        "electron-installer-dmg": "0.2.1",
-        "electron-installer-snap": "2.0.1",
-        "electron-packager": "11.2.0",
-        "electron-rebuild": "1.8.2",
-        "electron-windows-store": "0.12.0",
-        "electron-winstaller": "2.6.4",
-        "electron-wix-msi": "1.3.0",
-        "exact-version": "1.0.2",
-        "form-data": "2.3.2",
-        "fs-extra": "5.0.0",
-        "glob": "7.1.2",
-        "inquirer": "5.2.0",
-        "lodash.merge": "4.6.1",
-        "lodash.template": "4.4.0",
-        "log-symbols": "2.2.0",
-        "mime-types": "2.1.19",
-        "node-fetch": "2.2.0",
-        "node-gyp": "3.8.0",
-        "nugget": "2.0.1",
-        "opn": "5.3.0",
-        "ora": "2.1.0",
-        "parse-author": "2.0.0",
-        "pify": "3.0.0",
-        "resolve-package": "1.0.1",
-        "s3": "4.4.0",
-        "semver": "5.5.0",
-        "sudo-prompt": "8.2.0",
-        "tabtab": "2.2.2",
-        "username": "3.0.0",
-        "yarn-or-npm": "2.0.4",
-        "zip-folder": "1.0.0"
+        "@octokit/rest": "^15.2.6",
+        "aws-sdk": "^2.9.0",
+        "babel-register": "^6.16.3",
+        "bluebird": "^3.4.6",
+        "colors": "^1.1.2",
+        "commander": "^2.9.0",
+        "cross-spawn-promise": "^0.10.1",
+        "debug": "^3.0.0",
+        "electron-forge-template-angular2": "^1.0.3",
+        "electron-forge-template-react": "^1.0.2",
+        "electron-forge-template-react-typescript": "^1.0.3",
+        "electron-forge-template-vue": "^1.0.2",
+        "electron-installer-debian": "^0.8.0",
+        "electron-installer-dmg": "^0.2.0",
+        "electron-installer-flatpak": "^0.8.0",
+        "electron-installer-redhat": "^0.5.0",
+        "electron-installer-snap": "^2.0.0",
+        "electron-packager": "^11.0.0",
+        "electron-rebuild": "^1.6.0",
+        "electron-windows-store": "^0.12.0",
+        "electron-winstaller": "^2.5.0",
+        "electron-wix-msi": "^1.3.0",
+        "exact-version": "^1.0.1",
+        "form-data": "^2.1.4",
+        "fs-extra": "^5.0.0",
+        "glob": "^7.1.1",
+        "inquirer": "^5.0.0",
+        "lodash.merge": "^4.6.0",
+        "lodash.template": "^4.4.0",
+        "log-symbols": "^2.0.0",
+        "mime-types": "^2.1.17",
+        "node-fetch": "^2.0.0",
+        "node-gyp": "^3.4.0",
+        "nugget": "^2.0.1",
+        "opn": "^5.0.0",
+        "ora": "^2.0.0",
+        "parse-author": "^2.0.0",
+        "pify": "^3.0.0",
+        "resolve-package": "^1.0.1",
+        "s3": "^4.4.0",
+        "semver": "^5.3.0",
+        "sudo-prompt": "^8.0.0",
+        "tabtab": "^2.2.1",
+        "username": "^3.0.0",
+        "yarn-or-npm": "^2.0.2",
+        "zip-folder": "^1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -2678,6 +2839,180 @@
       "integrity": "sha1-WKEeyXKg8FGOEwbaelc/uva0rFA=",
       "dev": true
     },
+    "electron-installer-debian": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/electron-installer-debian/-/electron-installer-debian-0.8.1.tgz",
+      "integrity": "sha512-UkEk7d1L8gwaRnZMF1AcEb3WH5OStmUgv1AQUmTbKjvzGnAU9IZAZuDgFK/8hFClRJvhlWC6Xykv7WggC8jSxQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asar": "^0.14.0",
+        "cross-spawn-promise": "^0.10.1",
+        "debug": "^3.1.0",
+        "fs-extra": "^4.0.2",
+        "get-folder-size": "^1.0.0",
+        "glob": "^7.1.2",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "nodeify": "^1.0.1",
+        "pify": "^3.0.0",
+        "semver": "^5.4.1",
+        "temp": "^0.8.3",
+        "word-wrap": "^1.2.3",
+        "yargs": "^10.0.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true,
+          "optional": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true,
+          "optional": true
+        },
+        "yargs": {
+          "version": "10.1.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz",
+          "integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^8.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
+          "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
     "electron-installer-dmg": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/electron-installer-dmg/-/electron-installer-dmg-0.2.1.tgz",
@@ -2685,8 +3020,9 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "debug": "2.6.9",
-        "minimist": "1.2.0"
+        "appdmg": "^0.4.5",
+        "debug": "^2.2.0",
+        "minimist": "^1.1.1"
       },
       "dependencies": {
         "minimist": {
@@ -2698,6 +3034,219 @@
         }
       }
     },
+    "electron-installer-flatpak": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/electron-installer-flatpak/-/electron-installer-flatpak-0.8.0.tgz",
+      "integrity": "sha1-jt0Xjg4E7C2g+kDnd7Z8nMt4d18=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asar": "^0.12.0",
+        "async": "^2.0.0",
+        "debug": "^2.2.0",
+        "flatpak-bundler": "^0.1.0",
+        "fs-extra": "^0.30.0",
+        "lodash": "^4.13.0",
+        "temp": "^0.8.3",
+        "yargs": "^6.0.0"
+      },
+      "dependencies": {
+        "asar": {
+          "version": "0.12.4",
+          "resolved": "https://registry.npmjs.org/asar/-/asar-0.12.4.tgz",
+          "integrity": "sha1-LdPxFoguq4wPI7dUeSqCp9n84XE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chromium-pickle-js": "^0.2.0",
+            "commander": "^2.9.0",
+            "cuint": "^0.2.1",
+            "glob": "^6.0.4",
+            "minimatch": "^3.0.3",
+            "mkdirp": "^0.5.0",
+            "mksnapshot": "^0.3.0",
+            "tmp": "0.0.28"
+          }
+        },
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^4.2.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
+      }
+    },
+    "electron-installer-redhat": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/electron-installer-redhat/-/electron-installer-redhat-0.5.0.tgz",
+      "integrity": "sha1-CWmc03vJEc9/+ZWHuneqIF6DbNI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asar": "^0.13.0",
+        "async": "^2.1.5",
+        "debug": "^2.6.3",
+        "fs-extra": "^2.1.2",
+        "glob": "^7.1.1",
+        "lodash": "^4.17.4",
+        "parse-author": "^2.0.0",
+        "temp": "^0.8.3",
+        "word-wrap": "^1.2.1",
+        "yargs": "7.0.2"
+      },
+      "dependencies": {
+        "asar": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/asar/-/asar-0.13.1.tgz",
+          "integrity": "sha512-HJnZadTbDVDhBDv3tMyDov3ZnwMYYmz80/+a7S6cFPvulUyRz55UG5hOyHeWSP1iZud6vjFq8GOYM6xxtxJECQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chromium-pickle-js": "^0.2.0",
+            "commander": "^2.9.0",
+            "cuint": "^0.2.1",
+            "glob": "^6.0.4",
+            "minimatch": "^3.0.3",
+            "mkdirp": "^0.5.0",
+            "mksnapshot": "^0.3.0",
+            "tmp": "0.0.28"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "6.0.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+              "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "2 || 3",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        },
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "fs-extra": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+          "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0"
+          }
+        },
+        "yargs": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.0.2.tgz",
+          "integrity": "sha1-EVuX3xMhgj6Lhkjolox4JSEiH2c=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
+      }
+    },
     "electron-installer-snap": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/electron-installer-snap/-/electron-installer-snap-2.0.1.tgz",
@@ -2705,21 +3254,21 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asar": "0.14.3",
-        "cross-spawn-promise": "0.10.1",
-        "debug": "3.1.0",
-        "fs-extra": "5.0.0",
-        "js-yaml": "3.12.0",
-        "lodash.filter": "4.6.0",
-        "lodash.merge": "4.6.1",
-        "lodash.pull": "4.1.0",
-        "lodash.template": "4.4.0",
-        "nodeify": "1.0.1",
-        "pify": "3.0.0",
-        "semver": "5.5.0",
-        "tmp-promise": "1.0.5",
-        "which": "1.3.1",
-        "yargs": "11.1.0"
+        "asar": "^0.14.0",
+        "cross-spawn-promise": "^0.10.1",
+        "debug": "^3.0.1",
+        "fs-extra": "^5.0.0",
+        "js-yaml": "^3.10.0",
+        "lodash.filter": "^4.6.0",
+        "lodash.merge": "^4.6.0",
+        "lodash.pull": "^4.1.0",
+        "lodash.template": "^4.4.0",
+        "nodeify": "^1.0.1",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0",
+        "tmp-promise": "^1.0.3",
+        "which": "^1.3.0",
+        "yargs": "^11.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2742,9 +3291,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "debug": {
@@ -2764,7 +3313,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -2780,9 +3329,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
         "pify": {
@@ -2798,8 +3347,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -2808,7 +3357,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -2825,18 +3374,18 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^9.0.2"
           }
         },
         "yargs-parser": {
@@ -2846,7 +3395,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -2857,12 +3406,12 @@
       "integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "compare-version": "0.1.2",
-        "debug": "2.6.9",
-        "isbinaryfile": "3.0.3",
-        "minimist": "1.2.0",
-        "plist": "2.1.0"
+        "bluebird": "^3.5.0",
+        "compare-version": "^0.1.2",
+        "debug": "^2.6.8",
+        "isbinaryfile": "^3.0.2",
+        "minimist": "^1.2.0",
+        "plist": "^2.1.0"
       },
       "dependencies": {
         "minimist": {
@@ -2879,24 +3428,24 @@
       "integrity": "sha1-+swX0rksENob+h18X1jxN3RXGDk=",
       "dev": true,
       "requires": {
-        "asar": "0.14.3",
-        "debug": "3.1.0",
-        "electron-download": "4.1.0",
-        "electron-osx-sign": "0.4.10",
-        "extract-zip": "1.6.7",
-        "fs-extra": "5.0.0",
-        "get-package-info": "1.0.0",
-        "mz": "2.7.0",
-        "nodeify": "1.0.1",
-        "parse-author": "2.0.0",
-        "pify": "3.0.0",
-        "plist": "2.1.0",
-        "pruner": "0.0.7",
-        "rcedit": "1.1.0",
-        "resolve": "1.8.1",
-        "sanitize-filename": "1.6.1",
-        "semver": "5.5.0",
-        "yargs-parser": "9.0.2"
+        "asar": "^0.14.0",
+        "debug": "^3.0.0",
+        "electron-download": "^4.0.0",
+        "electron-osx-sign": "^0.4.1",
+        "extract-zip": "^1.0.3",
+        "fs-extra": "^5.0.0",
+        "get-package-info": "^1.0.0",
+        "mz": "^2.6.0",
+        "nodeify": "^1.0.1",
+        "parse-author": "^2.0.0",
+        "pify": "^3.0.0",
+        "plist": "^2.0.0",
+        "pruner": "^0.0.7",
+        "rcedit": "^1.0.0",
+        "resolve": "^1.1.6",
+        "sanitize-filename": "^1.6.0",
+        "semver": "^5.3.0",
+        "yargs-parser": "^9.0.2"
       },
       "dependencies": {
         "camelcase": {
@@ -2926,7 +3475,7 @@
           "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -2937,14 +3486,14 @@
       "integrity": "sha512-3vr0WBj5ix5pBjtdDwlwujVu8ddi7pyah12FD5A0ovtqhChpdZ/35gwKkaeWjT0vA2h0M8aDHOBMeeCG5iJrpA==",
       "dev": true,
       "requires": {
-        "babel-plugin-array-includes": "2.0.3",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-preset-es2016-node5": "1.1.2",
-        "babel-preset-react": "6.24.1",
+        "babel-plugin-array-includes": "^2.0.3",
+        "babel-plugin-transform-async-to-generator": "^6.24.1",
+        "babel-preset-es2016-node5": "^1.1.2",
+        "babel-preset-react": "^6.24.1",
         "electron": "2.0.7",
-        "electron-compile": "6.4.3",
-        "electron-compilers": "5.9.0",
-        "yargs": "6.6.0"
+        "electron-compile": "*",
+        "electron-compilers": "*",
+        "yargs": "^6.6.0"
       },
       "dependencies": {
         "@types/node": {
@@ -2959,9 +3508,9 @@
           "integrity": "sha512-MRrDE6mrp+ZrIBpZM27pxbO2yEDKYfkmc6Ll79BtedMNEZsY4+oblupeDJL6RM6meUIp82KMo63W7fP65Tb89Q==",
           "dev": true,
           "requires": {
-            "@types/node": "8.10.28",
-            "electron-download": "3.3.0",
-            "extract-zip": "1.6.7"
+            "@types/node": "^8.0.24",
+            "electron-download": "^3.0.1",
+            "extract-zip": "^1.0.3"
           }
         },
         "electron-download": {
@@ -2970,15 +3519,15 @@
           "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
           "dev": true,
           "requires": {
-            "debug": "2.6.9",
-            "fs-extra": "0.30.0",
-            "home-path": "1.0.6",
-            "minimist": "1.2.0",
-            "nugget": "2.0.1",
-            "path-exists": "2.1.0",
-            "rc": "1.2.8",
-            "semver": "5.5.0",
-            "sumchecker": "1.3.1"
+            "debug": "^2.2.0",
+            "fs-extra": "^0.30.0",
+            "home-path": "^1.0.1",
+            "minimist": "^1.2.0",
+            "nugget": "^2.0.0",
+            "path-exists": "^2.1.0",
+            "rc": "^1.1.2",
+            "semver": "^5.3.0",
+            "sumchecker": "^1.2.0"
           }
         },
         "fs-extra": {
@@ -2987,11 +3536,11 @@
           "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "klaw": "1.3.1",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
           }
         },
         "minimist": {
@@ -3006,8 +3555,8 @@
           "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
           "dev": true,
           "requires": {
-            "debug": "2.6.9",
-            "es6-promise": "4.2.4"
+            "debug": "^2.2.0",
+            "es6-promise": "^4.0.5"
           }
         },
         "yargs": {
@@ -3016,19 +3565,19 @@
           "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "4.2.1"
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^4.2.0"
           }
         },
         "yargs-parser": {
@@ -3037,7 +3586,7 @@
           "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0"
+            "camelcase": "^3.0.0"
           }
         }
       }
@@ -3048,16 +3597,16 @@
       "integrity": "sha512-EeR4dgb6NN7ybxduUWMeeLhU/EuF+FzwFZJfMJXD0bx96K+ttAieCXOn9lTO5nA9Qn3hiS7pEpk8pZ9StpGgSg==",
       "dev": true,
       "requires": {
-        "colors": "1.3.1",
-        "debug": "2.6.9",
-        "detect-libc": "1.0.3",
-        "fs-extra": "3.0.1",
-        "node-abi": "2.4.3",
-        "node-gyp": "3.8.0",
-        "ora": "1.4.0",
-        "rimraf": "2.6.2",
-        "spawn-rx": "2.0.12",
-        "yargs": "7.1.0"
+        "colors": "^1.2.0",
+        "debug": "^2.6.3",
+        "detect-libc": "^1.0.3",
+        "fs-extra": "^3.0.1",
+        "node-abi": "^2.0.0",
+        "node-gyp": "^3.6.0",
+        "ora": "^1.2.0",
+        "rimraf": "^2.6.1",
+        "spawn-rx": "^2.0.10",
+        "yargs": "^7.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -3066,7 +3615,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.2"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -3075,9 +3624,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
@@ -3095,9 +3644,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "3.0.1",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^3.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "jsonfile": {
@@ -3106,7 +3655,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.6"
           }
         },
         "ora": {
@@ -3115,10 +3664,10 @@
           "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1",
-            "cli-cursor": "2.1.0",
-            "cli-spinners": "1.3.1",
-            "log-symbols": "2.2.0"
+            "chalk": "^2.1.0",
+            "cli-cursor": "^2.1.0",
+            "cli-spinners": "^1.0.1",
+            "log-symbols": "^2.1.0"
           }
         },
         "supports-color": {
@@ -3127,7 +3676,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         },
         "yargs": {
@@ -3136,19 +3685,19 @@
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "5.0.0"
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
           }
         },
         "yargs-parser": {
@@ -3157,7 +3706,7 @@
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
-            "camelcase": "3.0.0"
+            "camelcase": "^3.0.0"
           }
         }
       }
@@ -3167,7 +3716,7 @@
       "resolved": "https://registry.npmjs.org/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz",
       "integrity": "sha1-GbTlWTP6Dvj1VnhLnGYPdyVGoLg=",
       "requires": {
-        "debug": "2.6.9"
+        "debug": "^2.2.0"
       }
     },
     "electron-to-chromium": {
@@ -3182,16 +3731,16 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "chalk": "2.4.1",
-        "commander": "2.17.1",
-        "debug": "2.6.9",
-        "flatten-packages": "0.1.4",
-        "fs-extra": "4.0.3",
-        "inquirer": "3.3.0",
-        "lodash.defaults": "4.2.0",
-        "lodash.merge": "4.6.1",
-        "multiline": "1.0.2",
-        "path-exists": "3.0.0"
+        "chalk": "^2.1.0",
+        "commander": "^2.11.0",
+        "debug": "^2.6.3",
+        "flatten-packages": "^0.1.4",
+        "fs-extra": "^4.0.1",
+        "inquirer": "^3.2.3",
+        "lodash.defaults": "^4.2.0",
+        "lodash.merge": "^4.6.0",
+        "multiline": "^1.0.2",
+        "path-exists": "^3.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3206,7 +3755,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.2"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -3215,9 +3764,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
@@ -3236,9 +3785,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "inquirer": {
@@ -3248,20 +3797,20 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ansi-escapes": "3.1.0",
-            "chalk": "2.4.1",
-            "cli-cursor": "2.1.0",
-            "cli-width": "2.2.0",
-            "external-editor": "2.2.0",
-            "figures": "2.0.0",
-            "lodash": "4.17.10",
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^2.0.4",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
             "mute-stream": "0.0.7",
-            "run-async": "2.3.0",
-            "rx-lite": "4.0.8",
-            "rx-lite-aggregates": "4.0.8",
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "through": "2.3.8"
+            "run-async": "^2.2.0",
+            "rx-lite": "^4.0.8",
+            "rx-lite-aggregates": "^4.0.8",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
           }
         },
         "is-fullwidth-code-point": {
@@ -3278,7 +3827,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.6"
           }
         },
         "path-exists": {
@@ -3295,8 +3844,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -3305,7 +3854,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -3314,7 +3863,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -3326,12 +3875,12 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asar": "0.11.0",
-        "bluebird": "3.5.1",
-        "debug": "2.6.9",
-        "fs-extra": "0.26.7",
-        "lodash.template": "4.4.0",
-        "temp": "0.8.3"
+        "asar": "^0.11.0",
+        "bluebird": "^3.3.4",
+        "debug": "^2.2.0",
+        "fs-extra": "^0.26.7",
+        "lodash.template": "^4.2.2",
+        "temp": "^0.8.3"
       },
       "dependencies": {
         "asar": {
@@ -3341,13 +3890,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chromium-pickle-js": "0.1.0",
-            "commander": "2.17.1",
-            "cuint": "0.2.2",
-            "glob": "6.0.4",
-            "minimatch": "3.0.4",
-            "mkdirp": "0.5.1",
-            "mksnapshot": "0.3.1"
+            "chromium-pickle-js": "^0.1.0",
+            "commander": "^2.9.0",
+            "cuint": "^0.2.1",
+            "glob": "^6.0.4",
+            "minimatch": "^3.0.0",
+            "mkdirp": "^0.5.0",
+            "mksnapshot": "^0.3.0"
           }
         },
         "chromium-pickle-js": {
@@ -3364,11 +3913,11 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "klaw": "1.3.1",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
           }
         },
         "glob": {
@@ -3378,11 +3927,11 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -3394,11 +3943,11 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "debug": "3.1.0",
-        "fs-extra": "4.0.3",
-        "klaw": "2.1.1",
-        "lodash": "4.17.10",
-        "uuid": "3.3.2"
+        "debug": "^3.1.0",
+        "fs-extra": "^4.0.2",
+        "klaw": "^2.1.0",
+        "lodash": "^4.17.4",
+        "uuid": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -3418,9 +3967,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "jsonfile": {
@@ -3430,7 +3979,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.6"
           }
         },
         "klaw": {
@@ -3440,7 +3989,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.9"
           }
         }
       }
@@ -3450,7 +3999,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "0.4.23"
+        "iconv-lite": "~0.4.13"
       }
     },
     "end-of-stream": {
@@ -3459,7 +4008,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "engine.io": {
@@ -3467,12 +4016,12 @@
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz",
       "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.4",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.2",
-        "ws": "3.3.3"
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
       },
       "dependencies": {
         "debug": {
@@ -3492,14 +4041,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.2",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "3.3.3",
-        "xmlhttprequest-ssl": "1.5.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -3519,10 +4068,10 @@
       "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "0.0.7",
+        "arraybuffer.slice": "~0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.4",
-        "has-binary2": "1.0.3"
+        "has-binary2": "~1.0.2"
       }
     },
     "entities": {
@@ -3544,7 +4093,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "prr": "1.0.1"
+        "prr": "~1.0.1"
       }
     },
     "error-ex": {
@@ -3552,7 +4101,7 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "es5-ext": {
@@ -3560,9 +4109,9 @@
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz",
       "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==",
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1",
-        "next-tick": "1.0.0"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "1"
       }
     },
     "es6-iterator": {
@@ -3570,9 +4119,9 @@
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.45",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
     "es6-promise": {
@@ -3587,7 +4136,7 @@
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
-        "es6-promise": "4.2.4"
+        "es6-promise": "^4.0.3"
       }
     },
     "es6-symbol": {
@@ -3595,8 +4144,8 @@
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.45"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "escape-string-regexp": {
@@ -3611,11 +4160,11 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.6.1"
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "esprima": {
@@ -3657,8 +4206,8 @@
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.45"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "events": {
@@ -3679,13 +4228,13 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "exit-hook": {
@@ -3700,7 +4249,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.1"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "extend": {
@@ -3714,9 +4263,9 @@
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "requires": {
-        "chardet": "0.4.2",
-        "iconv-lite": "0.4.23",
-        "tmp": "0.0.33"
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
       },
       "dependencies": {
         "tmp": {
@@ -3724,7 +4273,7 @@
           "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
           "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
           "requires": {
-            "os-tmpdir": "1.0.2"
+            "os-tmpdir": "~1.0.2"
           }
         }
       }
@@ -3735,9 +4284,9 @@
       "integrity": "sha1-WrvtyYwNUgLjJ4cn+Rktfghsa+E=",
       "dev": true,
       "requires": {
-        "eachr": "3.2.0",
-        "editions": "1.3.4",
-        "typechecker": "4.5.0"
+        "eachr": "^3.2.0",
+        "editions": "^1.1.1",
+        "typechecker": "^4.3.0"
       }
     },
     "extract-zip": {
@@ -3782,7 +4331,7 @@
       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
       "dev": true,
       "requires": {
-        "pend": "1.2.0"
+        "pend": "~1.2.0"
       }
     },
     "figures": {
@@ -3790,7 +4339,7 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5"
       }
     },
     "find-up": {
@@ -3798,8 +4347,8 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "findit2": {
@@ -3808,6 +4357,46 @@
       "integrity": "sha1-WKRmaX34piBc39vzlVNri9d3pfY=",
       "dev": true
     },
+    "flatpak-bundler": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/flatpak-bundler/-/flatpak-bundler-0.1.3.tgz",
+      "integrity": "sha1-5F36DEp0hcNw4JFeRyiSl5hQOUY=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "debug": "^2.2.0",
+        "es6-promisify": "^5.0.0",
+        "fs-extra": "^0.30.0",
+        "lodash": "^4.16.2",
+        "tmp": "0.0.29"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "tmp": {
+          "version": "0.0.29",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
+          "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-tmpdir": "~1.0.1"
+          }
+        }
+      }
+    },
     "flatten": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
@@ -3820,10 +4409,10 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "colors": "0.6.2",
-        "commander": "2.1.0",
-        "semver": "2.2.1",
-        "wrench": "1.5.9"
+        "colors": "~0.6.2",
+        "commander": "~2.1.0",
+        "semver": "~2.2.1",
+        "wrench": "~1.5.4"
       },
       "dependencies": {
         "colors": {
@@ -3849,6 +4438,16 @@
         }
       }
     },
+    "fmix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fmix/-/fmix-0.1.0.tgz",
+      "integrity": "sha1-x7vxJN7ELJ0ZHPuUfQqXeN2YbAw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "imul": "^1.0.0"
+      }
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -3861,9 +4460,9 @@
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
+        "asynckit": "^0.4.0",
         "combined-stream": "1.0.6",
-        "mime-types": "2.1.19"
+        "mime-types": "^2.1.12"
       }
     },
     "fs-extra": {
@@ -3872,9 +4471,9 @@
       "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.2"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "dependencies": {
         "jsonfile": {
@@ -3883,11 +4482,32 @@
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.6"
           }
         }
       }
     },
+    "fs-temp": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fs-temp/-/fs-temp-1.1.2.tgz",
+      "integrity": "sha1-zFLwOLvv5RD2vNCexZK3nQ9pJT8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "random-path": "^0.1.0"
+      }
+    },
+    "fs-xattr": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/fs-xattr/-/fs-xattr-0.1.17.tgz",
+      "integrity": "sha512-SpBbnN1lkSgBjELpnxnxfcl236ceCu6LnrfrT4CREsux4LP4PvKU37IpceJqAInnTTOWmeVHi9c8lKXIdfynPg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buffer-from": "^0.1.1",
+        "nan": "^2.3.2"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3899,10 +4519,10 @@
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       }
     },
     "function-bind": {
@@ -3910,20 +4530,47 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "gar": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/gar/-/gar-1.0.3.tgz",
+      "integrity": "sha512-zDpwk/l3HbhjVAvdxNUTJFzgXiNy0a7EmE/50XT38o1z+7NJbFhp+8CDsv1Qgy2adBAwUVYlMpIX2fZUbmlUJw==",
+      "dev": true,
+      "optional": true
+    },
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.3"
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-property": "^1.0.2"
+      }
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-property": "^1.0.0"
       }
     },
     "get-caller-file": {
@@ -3931,6 +4578,17 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
       "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
     },
+    "get-folder-size": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-folder-size/-/get-folder-size-1.0.1.tgz",
+      "integrity": "sha1-gC+kIIQ03nEgUYKxWrfxNSCI5YA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "^1.4.2",
+        "gar": "^1.0.2"
+      }
+    },
     "get-installed-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz",
@@ -3946,10 +4604,10 @@
       "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "debug": "2.6.9",
-        "lodash.get": "4.4.2",
-        "read-pkg-up": "2.0.0"
+        "bluebird": "^3.1.1",
+        "debug": "^2.2.0",
+        "lodash.get": "^4.0.0",
+        "read-pkg-up": "^2.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -3958,7 +4616,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "load-json-file": {
@@ -3967,10 +4625,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
         "path-type": {
@@ -3979,7 +4637,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "2.3.0"
+            "pify": "^2.0.0"
           }
         },
         "read-pkg": {
@@ -3988,9 +4646,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
           }
         },
         "read-pkg-up": {
@@ -3999,8 +4657,8 @@
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
           }
         },
         "strip-bom": {
@@ -4029,7 +4687,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "glob": {
@@ -4037,12 +4695,12 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "global-modules": {
@@ -4051,9 +4709,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
       }
     },
     "global-prefix": {
@@ -4062,11 +4720,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "homedir-polyfill": "1.0.1",
-        "ini": "1.3.5",
-        "is-windows": "1.0.2",
-        "which": "1.3.1"
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
       }
     },
     "globals": {
@@ -4081,7 +4739,7 @@
       "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
       "dev": true,
       "requires": {
-        "minimist": "1.1.3"
+        "minimist": "1.1.x"
       },
       "dependencies": {
         "minimist": {
@@ -4109,7 +4767,7 @@
       "integrity": "sha1-UUQh6dIlwp38j9MFRZq65YgV7yw=",
       "dev": true,
       "requires": {
-        "iterall": "1.2.2"
+        "iterall": "^1.0.0"
       }
     },
     "graphql-tag": {
@@ -4124,10 +4782,10 @@
       "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
       "dev": true,
       "requires": {
-        "async": "1.5.2",
-        "optimist": "0.6.1",
-        "source-map": "0.4.4",
-        "uglify-js": "2.8.29"
+        "async": "^1.4.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.4.4",
+        "uglify-js": "^2.6"
       },
       "dependencies": {
         "source-map": {
@@ -4136,7 +4794,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -4153,8 +4811,8 @@
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
       }
     },
     "has": {
@@ -4162,7 +4820,7 @@
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.1.1"
       }
     },
     "has-ansi": {
@@ -4170,7 +4828,7 @@
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-binary2": {
@@ -4210,8 +4868,8 @@
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "hash-sum": {
@@ -4226,10 +4884,10 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "2.x.x",
+        "cryptiles": "2.x.x",
+        "hoek": "2.x.x",
+        "sntp": "1.x.x"
       }
     },
     "he": {
@@ -4249,8 +4907,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
       }
     },
     "home-path": {
@@ -4265,7 +4923,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
@@ -4284,11 +4942,11 @@
       "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.3.0",
-        "domutils": "1.5.1",
-        "entities": "1.0.0",
-        "readable-stream": "1.1.14"
+        "domelementtype": "1",
+        "domhandler": "2.3",
+        "domutils": "1.5",
+        "entities": "1.0",
+        "readable-stream": "1.1"
       },
       "dependencies": {
         "entities": {
@@ -4305,7 +4963,7 @@
       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "dev": true,
       "requires": {
-        "agent-base": "4.2.1",
+        "agent-base": "4",
         "debug": "3.1.0"
       },
       "dependencies": {
@@ -4326,9 +4984,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.14.2"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-proxy-agent": {
@@ -4337,8 +4995,8 @@
       "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
       "dev": true,
       "requires": {
-        "agent-base": "4.2.1",
-        "debug": "3.1.0"
+        "agent-base": "^4.1.0",
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -4371,7 +5029,7 @@
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.0.0.tgz",
           "integrity": "sha512-0EdQvHuLm7yJ7lyG5dp7Q3X2ku++BG5ZHaJ5FTnaXpKqDrw4pMxel5Bt3oAYMthnrthFBdnZ1FcsXTPyrQlV0w==",
           "requires": {
-            "minimist": "1.2.0"
+            "minimist": "^1.2.0"
           }
         },
         "minimist": {
@@ -4386,7 +5044,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "ieee754": {
@@ -4407,13 +5065,19 @@
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
       "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM="
     },
+    "imul": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz",
+      "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
+      "dev": true
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "indexes-of": {
@@ -4431,8 +5095,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -4452,19 +5116,19 @@
       "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "3.1.0",
-        "chalk": "2.4.1",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "2.2.0",
-        "figures": "2.0.0",
-        "lodash": "4.17.10",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.1.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
         "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rxjs": "5.5.11",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
+        "run-async": "^2.2.0",
+        "rxjs": "^5.5.2",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
@@ -4479,7 +5143,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.2"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -4488,9 +5152,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
@@ -4514,8 +5178,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -4524,7 +5188,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -4533,7 +5197,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -4544,7 +5208,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "1.4.0"
+        "loose-envify": "^1.0.0"
       }
     },
     "invert-kv": {
@@ -4573,7 +5237,7 @@
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "requires": {
-        "builtin-modules": "1.1.1"
+        "builtin-modules": "^1.0.0"
       }
     },
     "is-finite": {
@@ -4582,7 +5246,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -4590,7 +5254,28 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "is-my-json-valid": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz",
+      "integrity": "sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^4.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "is-plain-obj": {
@@ -4604,6 +5289,12 @@
       "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=",
       "dev": true
     },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
     "is-relative-path": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz",
@@ -4620,7 +5311,7 @@
       "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
       "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
       "requires": {
-        "html-comment-regex": "1.1.1"
+        "html-comment-regex": "^1.1.0"
       }
     },
     "is-typedarray": {
@@ -4658,7 +5349,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "1.2.0"
+        "buffer-alloc": "^1.2.0"
       }
     },
     "isexe": {
@@ -4679,20 +5370,20 @@
       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.9",
-        "async": "1.5.2",
-        "escodegen": "1.8.1",
-        "esprima": "2.7.3",
-        "glob": "5.0.15",
-        "handlebars": "4.0.11",
-        "js-yaml": "3.12.0",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "once": "1.4.0",
-        "resolve": "1.1.7",
-        "supports-color": "3.2.3",
-        "which": "1.3.1",
-        "wordwrap": "1.0.0"
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
       },
       "dependencies": {
         "abbrev": {
@@ -4707,11 +5398,11 @@
           "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
           "dev": true,
           "requires": {
-            "esprima": "2.7.3",
-            "estraverse": "1.9.3",
-            "esutils": "2.0.2",
-            "optionator": "0.8.2",
-            "source-map": "0.2.0"
+            "esprima": "^2.7.1",
+            "estraverse": "^1.9.1",
+            "esutils": "^2.0.2",
+            "optionator": "^0.8.1",
+            "source-map": "~0.2.0"
           }
         },
         "esprima": {
@@ -4732,11 +5423,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "has-flag": {
@@ -4758,7 +5449,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         },
         "supports-color": {
@@ -4767,7 +5458,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -4785,15 +5476,15 @@
       "dev": true,
       "requires": {
         "character-parser": "1.2.1",
-        "clean-css": "3.4.28",
-        "commander": "2.6.0",
-        "constantinople": "3.0.2",
+        "clean-css": "^3.1.9",
+        "commander": "~2.6.0",
+        "constantinople": "~3.0.1",
         "jstransformer": "0.0.2",
-        "mkdirp": "0.5.1",
+        "mkdirp": "~0.5.0",
         "transformers": "2.1.0",
-        "uglify-js": "2.8.29",
-        "void-elements": "2.0.1",
-        "with": "4.0.3"
+        "uglify-js": "^2.4.19",
+        "void-elements": "~2.0.1",
+        "with": "~4.0.0"
       },
       "dependencies": {
         "commander": {
@@ -4832,8 +5523,8 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
       "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
       "requires": {
-        "argparse": "1.0.10",
-        "esprima": "4.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -4850,21 +5541,21 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "abab": "1.0.4",
-        "acorn": "2.7.0",
-        "acorn-globals": "1.0.9",
-        "cssom": "0.3.4",
-        "cssstyle": "0.2.37",
-        "escodegen": "1.11.0",
-        "nwmatcher": "1.4.4",
-        "parse5": "1.5.1",
-        "request": "2.87.0",
-        "sax": "1.2.1",
-        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.4",
-        "webidl-conversions": "2.0.1",
-        "whatwg-url-compat": "0.6.5",
-        "xml-name-validator": "2.0.1"
+        "abab": "^1.0.0",
+        "acorn": "^2.4.0",
+        "acorn-globals": "^1.0.4",
+        "cssom": ">= 0.3.0 < 0.4.0",
+        "cssstyle": ">= 0.2.29 < 0.3.0",
+        "escodegen": "^1.6.1",
+        "nwmatcher": ">= 1.3.7 < 2.0.0",
+        "parse5": "^1.5.1",
+        "request": "^2.55.0",
+        "sax": "^1.1.4",
+        "symbol-tree": ">= 3.1.0 < 4.0.0",
+        "tough-cookie": "^2.2.0",
+        "webidl-conversions": "^2.0.0",
+        "whatwg-url-compat": "~0.6.5",
+        "xml-name-validator": ">= 2.0.1 < 3.0.0"
       }
     },
     "jsesc": {
@@ -4892,7 +5583,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "jsonify": "0.0.0"
+        "jsonify": "~0.0.0"
       }
     },
     "json-stringify-safe": {
@@ -4912,7 +5603,7 @@
       "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -4922,6 +5613,13 @@
       "dev": true,
       "optional": true
     },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true,
+      "optional": true
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -4940,8 +5638,8 @@
       "integrity": "sha1-eq4pqQPRls+glz2IXT5HlH7Ndqs=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0",
-        "promise": "6.1.0"
+        "is-promise": "^2.0.0",
+        "promise": "^6.0.1"
       },
       "dependencies": {
         "is-promise": {
@@ -4956,7 +5654,7 @@
           "integrity": "sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=",
           "dev": true,
           "requires": {
-            "asap": "1.0.0"
+            "asap": "~1.0.0"
           }
         }
       }
@@ -4967,7 +5665,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.6"
+        "is-buffer": "^1.1.5"
       }
     },
     "klaw": {
@@ -4976,7 +5674,7 @@
       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.9"
       }
     },
     "lazy-cache": {
@@ -4991,7 +5689,7 @@
       "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.0.34"
+        "readable-stream": "~1.0.2"
       },
       "dependencies": {
         "isarray": {
@@ -5006,10 +5704,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
@@ -5019,7 +5717,7 @@
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "less": {
@@ -5028,14 +5726,14 @@
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
       "requires": {
-        "errno": "0.1.7",
-        "graceful-fs": "4.1.11",
-        "image-size": "0.5.5",
-        "mime": "1.6.0",
-        "mkdirp": "0.5.1",
-        "promise": "7.3.1",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "mime": "^1.2.11",
+        "mkdirp": "^0.5.0",
+        "promise": "^7.1.1",
         "request": "2.81.0",
-        "source-map": "0.5.7"
+        "source-map": "^0.5.3"
       },
       "dependencies": {
         "ajv": {
@@ -5045,8 +5743,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
           }
         },
         "asap": {
@@ -5077,9 +5775,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.6",
-            "mime-types": "2.1.19"
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.5",
+            "mime-types": "^2.1.12"
           }
         },
         "har-schema": {
@@ -5096,8 +5794,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "ajv": "^4.9.1",
+            "har-schema": "^1.0.5"
           }
         },
         "http-signature": {
@@ -5107,9 +5805,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.14.2"
+            "assert-plus": "^0.2.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
           }
         },
         "performance-now": {
@@ -5126,7 +5824,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asap": "2.0.6"
+            "asap": "~2.0.3"
           }
         },
         "qs": {
@@ -5143,28 +5841,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.8.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.6",
-            "extend": "3.0.2",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.19",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.1.2",
-            "stringstream": "0.0.6",
-            "tough-cookie": "2.3.4",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.3.2"
+            "aws-sign2": "~0.6.0",
+            "aws4": "^1.2.1",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.0",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.1.1",
+            "har-validator": "~4.2.1",
+            "hawk": "~3.1.3",
+            "http-signature": "~1.1.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.7",
+            "oauth-sign": "~0.8.1",
+            "performance-now": "^0.2.0",
+            "qs": "~6.4.0",
+            "safe-buffer": "^5.0.1",
+            "stringstream": "~0.0.4",
+            "tough-cookie": "~2.3.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.0.0"
           }
         }
       }
@@ -5175,8 +5873,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "load-json-file": {
@@ -5184,11 +5882,11 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "locate-path": {
@@ -5197,8 +5895,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       },
       "dependencies": {
         "path-exists": {
@@ -5297,8 +5995,8 @@
       "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.templatesettings": "4.1.0"
+        "lodash._reinterpolate": "~3.0.0",
+        "lodash.templatesettings": "^4.0.0"
       }
     },
     "lodash.templatesettings": {
@@ -5307,7 +6005,7 @@
       "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "3.0.0"
+        "lodash._reinterpolate": "~3.0.0"
       }
     },
     "lodash.uniq": {
@@ -5321,7 +6019,7 @@
       "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1"
+        "chalk": "^2.0.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -5330,7 +6028,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.2"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -5339,9 +6037,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
@@ -5359,7 +6057,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -5381,7 +6079,7 @@
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "js-tokens": "3.0.2"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
     "loud-rejection": {
@@ -5390,8 +6088,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lru-cache": {
@@ -5399,8 +6097,8 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "lz-string": {
@@ -5408,6 +6106,16 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
       "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
     },
+    "macos-alias": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/macos-alias/-/macos-alias-0.2.11.tgz",
+      "integrity": "sha1-/u6mwTuhGYFKQ/xDxHCzHlnvcYo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.4.0"
+      }
+    },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -5424,8 +6132,8 @@
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "mem": {
@@ -5434,7 +6142,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.2.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "meow": {
@@ -5443,16 +6151,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.4.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -5480,7 +6188,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
       "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
       "requires": {
-        "mime-db": "1.35.0"
+        "mime-db": "~1.35.0"
       }
     },
     "mimic-fn": {
@@ -5493,7 +6201,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "1.1.11"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -5523,7 +6231,7 @@
       "requires": {
         "decompress-zip": "0.3.0",
         "fs-extra": "0.26.7",
-        "request": "2.87.0"
+        "request": "^2.79.0"
       },
       "dependencies": {
         "fs-extra": {
@@ -5532,11 +6240,11 @@
           "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "klaw": "1.3.1",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
           }
         }
       }
@@ -5553,7 +6261,19 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "strip-indent": "1.0.1"
+        "strip-indent": "^1.0.0"
+      }
+    },
+    "murmur-32": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/murmur-32/-/murmur-32-0.1.0.tgz",
+      "integrity": "sha1-waedT8X6vwQFdJ0K/3fEFAIFWGE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "array-buffer-from-string": "^0.1.0",
+        "fmix": "^0.1.0",
+        "imul": "^1.0.0"
       }
     },
     "mute-stream": {
@@ -5567,11 +6287,17 @@
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "dev": true,
       "requires": {
-        "any-promise": "1.3.0",
-        "object-assign": "4.1.1",
-        "thenify-all": "1.6.0"
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
       }
     },
+    "nan": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+      "dev": true
+    },
     "natives": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
@@ -5583,6 +6309,16 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
+    "nested-error-stacks": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
+      "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inherits": "~2.0.1"
+      }
+    },
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
@@ -5603,7 +6339,7 @@
       "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
       "dev": true,
       "requires": {
-        "semver": "5.5.0"
+        "semver": "^5.4.1"
       }
     },
     "node-fetch": {
@@ -5618,18 +6354,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "1.0.11",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.5",
-        "request": "2.87.0",
-        "rimraf": "2.6.2",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "which": "1.3.1"
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "semver": {
@@ -5646,7 +6382,7 @@
       "integrity": "sha1-rRjjW/2z0Lb34OSv8eePhGo7iHM=",
       "dev": true,
       "requires": {
-        "babylon": "6.18.0"
+        "babylon": "^6.17.0"
       }
     },
     "nodeify": {
@@ -5655,8 +6391,8 @@
       "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
       "dev": true,
       "requires": {
-        "is-promise": "1.0.1",
-        "promise": "1.3.0"
+        "is-promise": "~1.0.0",
+        "promise": "~1.3.0"
       }
     },
     "nopt": {
@@ -5665,7 +6401,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
@@ -5673,10 +6409,10 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "requires": {
-        "hosted-git-info": "2.7.1",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.5.0",
-        "validate-npm-package-license": "3.0.4"
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-range": {
@@ -5689,10 +6425,10 @@
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
       "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
       "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
       }
     },
     "npm-run-path": {
@@ -5701,7 +6437,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
       }
     },
     "npmlog": {
@@ -5710,10 +6446,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "1.1.5",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
       }
     },
     "nth-check": {
@@ -5722,7 +6458,7 @@
       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
       "dev": true,
       "requires": {
-        "boolbase": "1.0.0"
+        "boolbase": "~1.0.0"
       }
     },
     "nugget": {
@@ -5731,12 +6467,12 @@
       "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "minimist": "1.2.0",
-        "pretty-bytes": "1.0.4",
-        "progress-stream": "1.2.0",
-        "request": "2.87.0",
-        "single-line-log": "1.1.2",
+        "debug": "^2.1.3",
+        "minimist": "^1.1.0",
+        "pretty-bytes": "^1.0.2",
+        "progress-stream": "^1.1.0",
+        "request": "^2.45.0",
+        "single-line-log": "^1.1.2",
         "throttleit": "0.0.2"
       },
       "dependencies": {
@@ -5792,7 +6528,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -5800,7 +6536,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "requires": {
-        "mimic-fn": "1.2.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "opencollective": {
@@ -5831,19 +6567,19 @@
           "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
           "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
           "requires": {
-            "ansi-escapes": "1.4.0",
-            "chalk": "1.1.3",
-            "cli-cursor": "2.1.0",
-            "cli-width": "2.2.0",
-            "external-editor": "2.2.0",
-            "figures": "2.0.0",
-            "lodash": "4.17.10",
+            "ansi-escapes": "^1.1.0",
+            "chalk": "^1.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^2.0.1",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
             "mute-stream": "0.0.7",
-            "run-async": "2.3.0",
-            "rx": "4.1.0",
-            "string-width": "2.1.1",
-            "strip-ansi": "3.0.1",
-            "through": "2.3.8"
+            "run-async": "^2.2.0",
+            "rx": "^4.1.0",
+            "string-width": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "through": "^2.3.6"
           }
         },
         "is-fullwidth-code-point": {
@@ -5861,8 +6597,8 @@
           "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz",
           "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=",
           "requires": {
-            "encoding": "0.1.12",
-            "is-stream": "1.1.0"
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
           }
         },
         "opn": {
@@ -5870,8 +6606,8 @@
           "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
           "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
           "requires": {
-            "object-assign": "4.1.1",
-            "pinkie-promise": "2.0.1"
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
           }
         },
         "string-width": {
@@ -5879,8 +6615,8 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -5888,7 +6624,7 @@
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -5901,7 +6637,7 @@
       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "optimist": {
@@ -5910,8 +6646,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8",
-        "wordwrap": "0.0.3"
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
       },
       "dependencies": {
         "wordwrap": {
@@ -5928,12 +6664,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       }
     },
     "ora": {
@@ -5942,12 +6678,12 @@
       "integrity": "sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "cli-cursor": "2.1.0",
-        "cli-spinners": "1.3.1",
-        "log-symbols": "2.2.0",
-        "strip-ansi": "4.0.0",
-        "wcwidth": "1.0.1"
+        "chalk": "^2.3.1",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^1.1.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^4.0.0",
+        "wcwidth": "^1.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -5962,7 +6698,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.2"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -5971,9 +6707,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "color-convert": {
@@ -5991,7 +6727,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -6000,7 +6736,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -6016,7 +6752,7 @@
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
       }
     },
     "os-shim": {
@@ -6036,8 +6772,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
     "p-finally": {
@@ -6052,7 +6788,7 @@
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "requires": {
-        "p-try": "1.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
@@ -6061,7 +6797,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.3.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-try": {
@@ -6076,7 +6812,26 @@
       "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=",
       "dev": true,
       "requires": {
-        "author-regex": "1.0.0"
+        "author-regex": "^1.0.0"
+      }
+    },
+    "parse-color": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz",
+      "integrity": "sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "color-convert": "~0.5.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "parse-json": {
@@ -6084,7 +6839,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "requires": {
-        "error-ex": "1.3.2"
+        "error-ex": "^1.2.0"
       }
     },
     "parse-passwd": {
@@ -6105,7 +6860,7 @@
       "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseuri": {
@@ -6113,7 +6868,7 @@
       "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "path-exists": {
@@ -6121,7 +6876,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "requires": {
-        "pinkie-promise": "2.0.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
@@ -6146,9 +6901,9 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "pend": {
@@ -6178,7 +6933,7 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "plist": {
@@ -6189,7 +6944,7 @@
       "requires": {
         "base64-js": "1.2.0",
         "xmlbuilder": "8.2.2",
-        "xmldom": "0.1.27"
+        "xmldom": "0.1.x"
       },
       "dependencies": {
         "base64-js": {
@@ -6216,10 +6971,10 @@
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
       "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
       "requires": {
-        "chalk": "1.1.3",
-        "js-base64": "2.4.8",
-        "source-map": "0.5.7",
-        "supports-color": "3.2.3"
+        "chalk": "^1.1.3",
+        "js-base64": "^2.1.9",
+        "source-map": "^0.5.6",
+        "supports-color": "^3.2.3"
       },
       "dependencies": {
         "has-flag": {
@@ -6232,7 +6987,7 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -6242,9 +6997,9 @@
       "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-message-helpers": "2.0.0",
-        "reduce-css-calc": "1.3.0"
+        "postcss": "^5.0.2",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-css-calc": "^1.2.6"
       }
     },
     "postcss-colormin": {
@@ -6252,9 +7007,9 @@
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
       "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
       "requires": {
-        "colormin": "1.1.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "colormin": "^1.0.5",
+        "postcss": "^5.0.13",
+        "postcss-value-parser": "^3.2.3"
       }
     },
     "postcss-convert-values": {
@@ -6262,8 +7017,8 @@
       "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
       "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.11",
+        "postcss-value-parser": "^3.1.2"
       }
     },
     "postcss-discard-comments": {
@@ -6271,7 +7026,7 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.14"
       }
     },
     "postcss-discard-duplicates": {
@@ -6279,7 +7034,7 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
       "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       }
     },
     "postcss-discard-empty": {
@@ -6287,7 +7042,7 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.14"
       }
     },
     "postcss-discard-overridden": {
@@ -6295,7 +7050,7 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.16"
       }
     },
     "postcss-discard-unused": {
@@ -6303,8 +7058,8 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "requires": {
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "postcss": "^5.0.14",
+        "uniqs": "^2.0.0"
       }
     },
     "postcss-filter-plugins": {
@@ -6312,7 +7067,7 @@
       "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
       "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       }
     },
     "postcss-merge-idents": {
@@ -6320,9 +7075,9 @@
       "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
       "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
       "requires": {
-        "has": "1.0.3",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.10",
+        "postcss-value-parser": "^3.1.1"
       }
     },
     "postcss-merge-longhand": {
@@ -6330,7 +7085,7 @@
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
       "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       }
     },
     "postcss-merge-rules": {
@@ -6338,11 +7093,11 @@
       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
       "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-api": "1.6.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.2"
+        "browserslist": "^1.5.2",
+        "caniuse-api": "^1.5.2",
+        "postcss": "^5.0.4",
+        "postcss-selector-parser": "^2.2.2",
+        "vendors": "^1.0.0"
       },
       "dependencies": {
         "browserslist": {
@@ -6350,8 +7105,8 @@
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "requires": {
-            "caniuse-db": "1.0.30000875",
-            "electron-to-chromium": "1.3.56"
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
           }
         }
       }
@@ -6366,9 +7121,9 @@
       "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
       "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
       "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
       }
     },
     "postcss-minify-gradients": {
@@ -6376,8 +7131,8 @@
       "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.12",
+        "postcss-value-parser": "^3.3.0"
       }
     },
     "postcss-minify-params": {
@@ -6385,10 +7140,10 @@
       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
       "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "uniqs": "2.0.0"
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.2",
+        "postcss-value-parser": "^3.0.2",
+        "uniqs": "^2.0.0"
       }
     },
     "postcss-minify-selectors": {
@@ -6396,10 +7151,10 @@
       "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
       "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "has": "1.0.3",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3"
+        "alphanum-sort": "^1.0.2",
+        "has": "^1.0.1",
+        "postcss": "^5.0.14",
+        "postcss-selector-parser": "^2.0.0"
       }
     },
     "postcss-normalize-charset": {
@@ -6407,7 +7162,7 @@
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.5"
       }
     },
     "postcss-normalize-url": {
@@ -6415,10 +7170,10 @@
       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
       "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
       "requires": {
-        "is-absolute-url": "2.1.0",
-        "normalize-url": "1.9.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^1.4.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3"
       }
     },
     "postcss-ordered-values": {
@@ -6426,8 +7181,8 @@
       "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
       "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.1"
       }
     },
     "postcss-reduce-idents": {
@@ -6435,8 +7190,8 @@
       "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
       }
     },
     "postcss-reduce-initial": {
@@ -6444,7 +7199,7 @@
       "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^5.0.4"
       }
     },
     "postcss-reduce-transforms": {
@@ -6452,9 +7207,9 @@
       "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
       "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
       "requires": {
-        "has": "1.0.3",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.8",
+        "postcss-value-parser": "^3.0.1"
       }
     },
     "postcss-selector-parser": {
@@ -6462,9 +7217,9 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
       "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
       "requires": {
-        "flatten": "1.0.2",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       }
     },
     "postcss-svgo": {
@@ -6472,10 +7227,10 @@
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
       "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
       "requires": {
-        "is-svg": "2.1.0",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "svgo": "0.7.2"
+        "is-svg": "^2.0.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3",
+        "svgo": "^0.7.0"
       }
     },
     "postcss-unique-selectors": {
@@ -6483,9 +7238,9 @@
       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
       "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
       }
     },
     "postcss-value-parser": {
@@ -6498,9 +7253,9 @@
       "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
       "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
       "requires": {
-        "has": "1.0.3",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "has": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
       }
     },
     "prelude-ls": {
@@ -6520,8 +7275,8 @@
       "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
       "dev": true,
       "requires": {
-        "get-stdin": "4.0.1",
-        "meow": "3.7.0"
+        "get-stdin": "^4.0.1",
+        "meow": "^3.1.0"
       }
     },
     "private": {
@@ -6542,8 +7297,8 @@
       "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
       "dev": true,
       "requires": {
-        "speedometer": "0.1.4",
-        "through2": "0.2.3"
+        "speedometer": "~0.1.2",
+        "through2": "~0.2.3"
       }
     },
     "promise": {
@@ -6552,7 +7307,7 @@
       "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
       "dev": true,
       "requires": {
-        "is-promise": "1.0.1"
+        "is-promise": "~1"
       }
     },
     "prr": {
@@ -6568,7 +7323,7 @@
       "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=",
       "dev": true,
       "requires": {
-        "fs-extra": "4.0.3"
+        "fs-extra": "^4.0.0"
       },
       "dependencies": {
         "fs-extra": {
@@ -6577,9 +7332,9 @@
           "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "jsonfile": {
@@ -6588,7 +7343,7 @@
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "graceful-fs": "^4.1.6"
           }
         }
       }
@@ -6620,8 +7375,8 @@
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
       "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
       "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
       }
     },
     "querystring": {
@@ -6630,16 +7385,27 @@
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
       "dev": true
     },
+    "random-path": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/random-path/-/random-path-0.1.1.tgz",
+      "integrity": "sha1-+PTTb3WhNMoV/TnH11BfvxY7Y0w=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "base32-encode": "^0.1.0",
+        "murmur-32": "^0.1.0"
+      }
+    },
     "rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "0.6.0",
-        "ini": "1.3.5",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
       },
       "dependencies": {
         "minimist": {
@@ -6661,9 +7427,9 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
@@ -6671,8 +7437,8 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       }
     },
     "readable-stream": {
@@ -6681,10 +7447,10 @@
       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
       "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
         "isarray": "0.0.1",
-        "string_decoder": "0.10.31"
+        "string_decoder": "~0.10.x"
       },
       "dependencies": {
         "isarray": {
@@ -6701,8 +7467,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       }
     },
     "reduce-css-calc": {
@@ -6710,9 +7476,9 @@
       "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
       "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
       "requires": {
-        "balanced-match": "0.4.2",
-        "math-expression-evaluator": "1.2.17",
-        "reduce-function-call": "1.0.2"
+        "balanced-match": "^0.4.2",
+        "math-expression-evaluator": "^1.2.14",
+        "reduce-function-call": "^1.0.1"
       },
       "dependencies": {
         "balanced-match": {
@@ -6727,7 +7493,7 @@
       "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
       "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
       "requires": {
-        "balanced-match": "0.4.2"
+        "balanced-match": "^0.4.2"
       },
       "dependencies": {
         "balanced-match": {
@@ -6754,9 +7520,9 @@
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "private": "0.1.8"
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
       }
     },
     "regexpu-core": {
@@ -6765,9 +7531,9 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "1.4.0",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
       }
     },
     "regjsgen": {
@@ -6782,7 +7548,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       }
     },
     "repeat-string": {
@@ -6797,7 +7563,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "request": {
@@ -6806,26 +7572,26 @@
       "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.8.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.6",
-        "extend": "3.0.2",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.2",
-        "har-validator": "5.0.3",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.19",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.2",
-        "safe-buffer": "5.1.2",
-        "tough-cookie": "2.3.4",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.3.2"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.6.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.5",
+        "extend": "~3.0.1",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.1",
+        "har-validator": "~5.0.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.17",
+        "oauth-sign": "~0.8.2",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.1",
+        "safe-buffer": "^5.1.1",
+        "tough-cookie": "~2.3.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.1.0"
       }
     },
     "require-directory": {
@@ -6844,7 +7610,7 @@
       "integrity": "sha1-dC3Mwg86lpGNZsbxWX3I/+vE9vU=",
       "dev": true,
       "requires": {
-        "editions": "1.3.4"
+        "editions": "^1.1.1"
       }
     },
     "resolve": {
@@ -6853,7 +7619,7 @@
       "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.6"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-dir": {
@@ -6862,8 +7628,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
       }
     },
     "resolve-package": {
@@ -6872,7 +7638,7 @@
       "integrity": "sha1-aG9wsYi9fWdfW7xCgszaBgq7nSc=",
       "dev": true,
       "requires": {
-        "get-installed-path": "2.1.1"
+        "get-installed-path": "^2.0.3"
       }
     },
     "restore-cursor": {
@@ -6880,8 +7646,8 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "right-align": {
@@ -6890,7 +7656,7 @@
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
       "requires": {
-        "align-text": "0.1.4"
+        "align-text": "^0.1.1"
       }
     },
     "rimraf": {
@@ -6898,7 +7664,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       }
     },
     "ripemd160": {
@@ -6906,8 +7672,8 @@
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "run-async": {
@@ -6915,7 +7681,7 @@
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       },
       "dependencies": {
         "is-promise": {
@@ -6943,7 +7709,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "rx-lite": "4.0.8"
+        "rx-lite": "*"
       }
     },
     "rxjs": {
@@ -6960,15 +7726,15 @@
       "integrity": "sha1-VqT3dVFae2ucjlxrGrUfkDdmnx8=",
       "dev": true,
       "requires": {
-        "aws-sdk": "2.0.31",
-        "fd-slicer": "1.0.1",
-        "findit2": "2.2.3",
-        "graceful-fs": "3.0.11",
-        "mime": "1.2.11",
-        "mkdirp": "0.5.1",
-        "pend": "1.2.0",
-        "rimraf": "2.2.8",
-        "streamsink": "1.2.0"
+        "aws-sdk": "~2.0.31",
+        "fd-slicer": "~1.0.0",
+        "findit2": "~2.2.3",
+        "graceful-fs": "~3.0.5",
+        "mime": "~1.2.11",
+        "mkdirp": "~0.5.0",
+        "pend": "~1.2.0",
+        "rimraf": "~2.2.8",
+        "streamsink": "~1.2.0"
       },
       "dependencies": {
         "aws-sdk": {
@@ -6987,7 +7753,7 @@
           "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
           "dev": true,
           "requires": {
-            "natives": "1.1.4"
+            "natives": "^1.1.0"
           }
         },
         "mime": {
@@ -7036,8 +7802,8 @@
       "integrity": "sha1-+CrrS9165R9lPrIPZyizBYyNZEU=",
       "dev": true,
       "requires": {
-        "editions": "1.3.4",
-        "graceful-fs": "4.1.11"
+        "editions": "^1.1.1",
+        "graceful-fs": "^4.1.4"
       }
     },
     "safer-buffer": {
@@ -7051,10 +7817,10 @@
       "integrity": "sha1-dB4kXiMfB8r7b98PEzrfohalAq0=",
       "dev": true,
       "requires": {
-        "es6-promise": "3.3.1",
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "es6-promise": "^3.1.2",
+        "graceful-fs": "^4.1.3",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.2"
       },
       "dependencies": {
         "es6-promise": {
@@ -7071,7 +7837,7 @@
       "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
       "dev": true,
       "requires": {
-        "truncate-utf8-bytes": "1.0.2"
+        "truncate-utf8-bytes": "^1.0.0"
       }
     },
     "sass-lookup": {
@@ -7080,8 +7846,8 @@
       "integrity": "sha1-2kSiG+6llV8U7/24G97idRttFeI=",
       "dev": true,
       "requires": {
-        "commander": "2.8.1",
-        "is-relative-path": "1.0.2"
+        "commander": "~2.8.1",
+        "is-relative-path": "~1.0.0"
       },
       "dependencies": {
         "commander": {
@@ -7090,7 +7856,7 @@
           "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
           "dev": true,
           "requires": {
-            "graceful-readlink": "1.0.1"
+            "graceful-readlink": ">= 1.0.0"
           }
         }
       }
@@ -7111,8 +7877,8 @@
       "resolved": "https://registry.npmjs.org/secure-ls/-/secure-ls-1.2.1.tgz",
       "integrity": "sha1-gdiGKnV1ZLqRGOLPDp8pejvsvdI=",
       "requires": {
-        "crypto-js": "3.1.8",
-        "lz-string": "1.4.4"
+        "crypto-js": "^3.1.6",
+        "lz-string": "^1.4.4"
       },
       "dependencies": {
         "crypto-js": {
@@ -7142,8 +7908,8 @@
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "shebang-command": {
@@ -7152,7 +7918,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -7178,7 +7944,7 @@
       "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "^1.0.1"
       }
     },
     "slash": {
@@ -7194,7 +7960,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "2.x.x"
       }
     },
     "socket.io": {
@@ -7202,12 +7968,12 @@
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
       "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "requires": {
-        "debug": "3.1.0",
-        "engine.io": "3.2.0",
-        "has-binary2": "1.0.3",
-        "socket.io-adapter": "1.1.1",
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
         "socket.io-client": "2.1.1",
-        "socket.io-parser": "3.2.0"
+        "socket.io-parser": "~3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -7234,15 +8000,15 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "3.1.0",
-        "engine.io-client": "3.2.1",
-        "has-binary2": "1.0.3",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "3.2.0",
+        "socket.io-parser": "~3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -7262,7 +8028,7 @@
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "3.1.0",
+        "debug": "~3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -7287,10 +8053,10 @@
       "integrity": "sha1-iukK19fLBfxZ8asMY3hF1cFaUrc=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "minimist": "1.2.0",
-        "sander": "0.5.1",
-        "sourcemap-codec": "1.4.1"
+        "buffer-crc32": "^0.2.5",
+        "minimist": "^1.2.0",
+        "sander": "^0.5.0",
+        "sourcemap-codec": "^1.3.0"
       },
       "dependencies": {
         "minimist": {
@@ -7306,7 +8072,7 @@
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "requires": {
-        "is-plain-obj": "1.1.0"
+        "is-plain-obj": "^1.0.0"
       }
     },
     "source-map": {
@@ -7320,7 +8086,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.5.6"
       }
     },
     "sourcemap-codec": {
@@ -7334,9 +8100,9 @@
       "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
       "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
       "requires": {
-        "debug": "2.6.9",
-        "lodash.assign": "4.2.0",
-        "rxjs": "5.5.11"
+        "debug": "^2.5.1",
+        "lodash.assign": "^4.2.0",
+        "rxjs": "^5.1.1"
       }
     },
     "spawn-sync": {
@@ -7345,8 +8111,8 @@
       "integrity": "sha1-sAeZVX63+wyDdsKdROih6mfldHY=",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "os-shim": "0.1.3"
+        "concat-stream": "^1.4.7",
+        "os-shim": "^0.1.2"
       }
     },
     "spdx-correct": {
@@ -7354,8 +8120,8 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
       "requires": {
-        "spdx-expression-parse": "3.0.0",
-        "spdx-license-ids": "3.0.0"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
@@ -7368,8 +8134,8 @@
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "requires": {
-        "spdx-exceptions": "2.1.0",
-        "spdx-license-ids": "3.0.0"
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
@@ -7394,17 +8160,24 @@
       "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
       "dev": true,
       "requires": {
-        "asn1": "0.2.4",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.2",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.2",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
+    "stream-buffers": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
+      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=",
+      "dev": true,
+      "optional": true
+    },
     "streamsink": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz",
@@ -7421,9 +8194,9 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string_decoder": {
@@ -7444,7 +8217,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -7452,7 +8225,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "requires": {
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-eof": {
@@ -7467,7 +8240,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "4.0.1"
+        "get-stdin": "^4.0.1"
       }
     },
     "strip-json-comments": {
@@ -7482,12 +8255,12 @@
       "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
       "dev": true,
       "requires": {
-        "css-parse": "1.7.0",
-        "debug": "2.6.9",
-        "glob": "7.0.6",
-        "mkdirp": "0.5.1",
-        "sax": "0.5.8",
-        "source-map": "0.1.43"
+        "css-parse": "1.7.x",
+        "debug": "*",
+        "glob": "7.0.x",
+        "mkdirp": "0.5.x",
+        "sax": "0.5.x",
+        "source-map": "0.1.x"
       },
       "dependencies": {
         "css-parse": {
@@ -7502,12 +8275,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "sax": {
@@ -7522,7 +8295,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -7533,9 +8306,9 @@
       "integrity": "sha1-eVm+rAu1V+vROvO8Osvu/7J2YNQ=",
       "dev": true,
       "requires": {
-        "commander": "2.8.1",
-        "debug": "3.1.0",
-        "is-relative-path": "1.0.2"
+        "commander": "~2.8.1",
+        "debug": "^3.1.0",
+        "is-relative-path": "~1.0.0"
       },
       "dependencies": {
         "commander": {
@@ -7544,7 +8317,7 @@
           "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
           "dev": true,
           "requires": {
-            "graceful-readlink": "1.0.1"
+            "graceful-readlink": ">= 1.0.0"
           }
         },
         "debug": {
@@ -7570,7 +8343,7 @@
       "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9"
+        "debug": "^2.2.0"
       }
     },
     "supports-color": {
@@ -7583,13 +8356,13 @@
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
       "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
       "requires": {
-        "coa": "1.0.4",
-        "colors": "1.1.2",
-        "csso": "2.3.2",
-        "js-yaml": "3.7.0",
-        "mkdirp": "0.5.1",
-        "sax": "1.2.1",
-        "whet.extend": "0.9.9"
+        "coa": "~1.0.1",
+        "colors": "~1.1.2",
+        "csso": "~2.3.1",
+        "js-yaml": "~3.7.0",
+        "mkdirp": "~0.5.1",
+        "sax": "~1.2.1",
+        "whet.extend": "~0.9.9"
       },
       "dependencies": {
         "colors": {
@@ -7607,8 +8380,8 @@
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
           "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
           "requires": {
-            "argparse": "1.0.10",
-            "esprima": "2.7.3"
+            "argparse": "^1.0.7",
+            "esprima": "^2.6.0"
           }
         }
       }
@@ -7637,14 +8410,14 @@
       "integrity": "sha1-egR/FDsBC0y9MfhX6ClhUSy/ThQ=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "inquirer": "1.2.3",
-        "lodash.difference": "4.5.0",
-        "lodash.uniq": "4.5.0",
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "npmlog": "2.0.4",
-        "object-assign": "4.1.1"
+        "debug": "^2.2.0",
+        "inquirer": "^1.0.2",
+        "lodash.difference": "^4.5.0",
+        "lodash.uniq": "^4.5.0",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "npmlog": "^2.0.3",
+        "object-assign": "^4.1.0"
       },
       "dependencies": {
         "ansi-escapes": {
@@ -7659,7 +8432,7 @@
           "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
           "dev": true,
           "requires": {
-            "restore-cursor": "1.0.1"
+            "restore-cursor": "^1.0.1"
           }
         },
         "external-editor": {
@@ -7668,9 +8441,9 @@
           "integrity": "sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=",
           "dev": true,
           "requires": {
-            "extend": "3.0.2",
-            "spawn-sync": "1.0.15",
-            "tmp": "0.0.29"
+            "extend": "^3.0.0",
+            "spawn-sync": "^1.0.15",
+            "tmp": "^0.0.29"
           }
         },
         "figures": {
@@ -7679,8 +8452,8 @@
           "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
           }
         },
         "gauge": {
@@ -7689,11 +8462,11 @@
           "integrity": "sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=",
           "dev": true,
           "requires": {
-            "ansi": "0.3.1",
-            "has-unicode": "2.0.1",
-            "lodash.pad": "4.5.1",
-            "lodash.padend": "4.6.1",
-            "lodash.padstart": "4.6.1"
+            "ansi": "^0.3.0",
+            "has-unicode": "^2.0.0",
+            "lodash.pad": "^4.1.0",
+            "lodash.padend": "^4.1.0",
+            "lodash.padstart": "^4.1.0"
           }
         },
         "inquirer": {
@@ -7702,20 +8475,20 @@
           "integrity": "sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=",
           "dev": true,
           "requires": {
-            "ansi-escapes": "1.4.0",
-            "chalk": "1.1.3",
-            "cli-cursor": "1.0.2",
-            "cli-width": "2.2.0",
-            "external-editor": "1.1.1",
-            "figures": "1.7.0",
-            "lodash": "4.17.10",
+            "ansi-escapes": "^1.1.0",
+            "chalk": "^1.0.0",
+            "cli-cursor": "^1.0.1",
+            "cli-width": "^2.0.0",
+            "external-editor": "^1.1.0",
+            "figures": "^1.3.5",
+            "lodash": "^4.3.0",
             "mute-stream": "0.0.6",
-            "pinkie-promise": "2.0.1",
-            "run-async": "2.3.0",
-            "rx": "4.1.0",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "through": "2.3.8"
+            "pinkie-promise": "^2.0.0",
+            "run-async": "^2.2.0",
+            "rx": "^4.1.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.0",
+            "through": "^2.3.6"
           }
         },
         "minimist": {
@@ -7736,9 +8509,9 @@
           "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=",
           "dev": true,
           "requires": {
-            "ansi": "0.3.1",
-            "are-we-there-yet": "1.1.5",
-            "gauge": "1.2.7"
+            "ansi": "~0.3.1",
+            "are-we-there-yet": "~1.1.2",
+            "gauge": "~1.2.5"
           }
         },
         "onetime": {
@@ -7753,8 +8526,8 @@
           "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
           "dev": true,
           "requires": {
-            "exit-hook": "1.1.1",
-            "onetime": "1.1.0"
+            "exit-hook": "^1.0.0",
+            "onetime": "^1.0.0"
           }
         },
         "tmp": {
@@ -7763,7 +8536,7 @@
           "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
           "dev": true,
           "requires": {
-            "os-tmpdir": "1.0.2"
+            "os-tmpdir": "~1.0.1"
           }
         }
       }
@@ -7774,9 +8547,9 @@
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
       }
     },
     "tar-stream": {
@@ -7785,10 +8558,10 @@
       "integrity": "sha1-Hx0s6evHtCdlJDyg6PG3v9oKrc0=",
       "dev": true,
       "requires": {
-        "bl": "0.9.5",
-        "end-of-stream": "1.4.1",
-        "readable-stream": "1.1.14",
-        "xtend": "4.0.1"
+        "bl": "^0.9.0",
+        "end-of-stream": "^1.0.0",
+        "readable-stream": "^1.0.27-1",
+        "xtend": "^4.0.0"
       }
     },
     "temp": {
@@ -7798,8 +8571,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "os-tmpdir": "1.0.2",
-        "rimraf": "2.2.8"
+        "os-tmpdir": "^1.0.0",
+        "rimraf": "~2.2.6"
       },
       "dependencies": {
         "rimraf": {
@@ -7817,7 +8590,7 @@
       "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
       "dev": true,
       "requires": {
-        "any-promise": "1.3.0"
+        "any-promise": "^1.0.0"
       }
     },
     "thenify-all": {
@@ -7826,7 +8599,7 @@
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
       "dev": true,
       "requires": {
-        "thenify": "3.3.0"
+        "thenify": ">= 3.1.0 < 4"
       }
     },
     "throttleit": {
@@ -7846,8 +8619,8 @@
       "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.1.14",
-        "xtend": "2.1.2"
+        "readable-stream": "~1.1.9",
+        "xtend": "~2.1.1"
       },
       "dependencies": {
         "xtend": {
@@ -7856,7 +8629,7 @@
           "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
           "dev": true,
           "requires": {
-            "object-keys": "0.4.0"
+            "object-keys": "~0.4.0"
           }
         }
       }
@@ -7867,7 +8640,7 @@
       "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.1"
       }
     },
     "tmp-promise": {
@@ -7877,7 +8650,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "bluebird": "3.5.1",
+        "bluebird": "^3.5.0",
         "tmp": "0.0.33"
       },
       "dependencies": {
@@ -7888,11 +8661,21 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-tmpdir": "1.0.2"
+            "os-tmpdir": "~1.0.2"
           }
         }
       }
     },
+    "tn1150": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tn1150/-/tn1150-0.1.0.tgz",
+      "integrity": "sha1-ZzUD0k1WuH3ouMd/7j/AhT1ZoY0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "unorm": "^1.4.1"
+      }
+    },
     "to-array": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
@@ -7910,7 +8693,7 @@
       "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
       "dev": true,
       "requires": {
-        "nopt": "1.0.10"
+        "nopt": "~1.0.10"
       },
       "dependencies": {
         "nopt": {
@@ -7919,7 +8702,7 @@
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
           "dev": true,
           "requires": {
-            "abbrev": "1.1.1"
+            "abbrev": "1"
           }
         }
       }
@@ -7930,7 +8713,7 @@
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "requires": {
-        "punycode": "1.4.1"
+        "punycode": "^1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -7947,8 +8730,8 @@
       "integrity": "sha1-+tK0RTcsy7gxYJ1OeAP885K+1M4=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "synchronous-promise": "1.0.18"
+        "debug": "^2.5.1",
+        "synchronous-promise": "^1.0.7"
       }
     },
     "tr46": {
@@ -7964,9 +8747,9 @@
       "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=",
       "dev": true,
       "requires": {
-        "css": "1.0.8",
-        "promise": "2.0.0",
-        "uglify-js": "2.2.5"
+        "css": "~1.0.8",
+        "promise": "~2.0",
+        "uglify-js": "~2.2.5"
       },
       "dependencies": {
         "optimist": {
@@ -7975,7 +8758,7 @@
           "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
           "dev": true,
           "requires": {
-            "wordwrap": "0.0.3"
+            "wordwrap": "~0.0.2"
           }
         },
         "promise": {
@@ -7984,7 +8767,7 @@
           "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=",
           "dev": true,
           "requires": {
-            "is-promise": "1.0.1"
+            "is-promise": "~1"
           }
         },
         "source-map": {
@@ -7993,7 +8776,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         },
         "uglify-js": {
@@ -8002,8 +8785,8 @@
           "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=",
           "dev": true,
           "requires": {
-            "optimist": "0.3.7",
-            "source-map": "0.1.43"
+            "optimist": "~0.3.5",
+            "source-map": "~0.1.7"
           }
         },
         "wordwrap": {
@@ -8038,7 +8821,7 @@
       "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
       "dev": true,
       "requires": {
-        "utf8-byte-length": "1.0.4"
+        "utf8-byte-length": "^1.0.1"
       }
     },
     "tunnel-agent": {
@@ -8047,7 +8830,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -8063,7 +8846,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2"
+        "prelude-ls": "~1.1.2"
       }
     },
     "typechecker": {
@@ -8072,7 +8855,7 @@
       "integrity": "sha512-bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w==",
       "dev": true,
       "requires": {
-        "editions": "1.3.4"
+        "editions": "^1.3.4"
       }
     },
     "typedarray": {
@@ -8093,9 +8876,9 @@
       "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
       },
       "dependencies": {
         "camelcase": {
@@ -8110,8 +8893,8 @@
           "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
           "dev": true,
           "requires": {
-            "center-align": "0.1.3",
-            "right-align": "0.1.3",
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
             "wordwrap": "0.0.2"
           }
         },
@@ -8133,9 +8916,9 @@
           "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
           "dev": true,
           "requires": {
-            "camelcase": "1.2.1",
-            "cliui": "2.1.0",
-            "decamelize": "1.2.0",
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
             "window-size": "0.1.0"
           }
         }
@@ -8169,6 +8952,13 @@
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true
     },
+    "unorm": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
+      "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=",
+      "dev": true,
+      "optional": true
+    },
     "url": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
@@ -8191,8 +8981,8 @@
       "integrity": "sha1-s9upgqcrTOWdUvFZ+hrromavX8g=",
       "dev": true,
       "requires": {
-        "execa": "0.7.0",
-        "mem": "1.1.0"
+        "execa": "^0.7.0",
+        "mem": "^1.1.0"
       }
     },
     "utf8-byte-length": {
@@ -8217,8 +9007,8 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "requires": {
-        "spdx-correct": "3.0.0",
-        "spdx-expression-parse": "3.0.0"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
     "vendors": {
@@ -8232,9 +9022,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
+        "extsprintf": "^1.2.0"
       }
     },
     "void-elements": {
@@ -8268,8 +9058,8 @@
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz",
       "integrity": "sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==",
       "requires": {
-        "de-indent": "1.0.2",
-        "he": "1.1.1"
+        "de-indent": "^1.0.2",
+        "he": "^1.1.0"
       }
     },
     "vue-template-es2015-compiler": {
@@ -8282,20 +9072,20 @@
       "resolved": "https://registry.npmjs.org/vueify/-/vueify-9.4.1.tgz",
       "integrity": "sha1-0pqXdaM8S4qGAeGGqF2iq4AMoNY=",
       "requires": {
-        "chalk": "1.1.3",
-        "convert-source-map": "1.5.1",
-        "cssnano": "3.10.0",
-        "hash-sum": "1.0.2",
-        "json5": "0.5.1",
-        "lru-cache": "4.1.3",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3",
-        "source-map": "0.5.7",
-        "through": "2.3.8",
-        "vue-hot-reload-api": "2.3.0",
-        "vue-template-compiler": "2.5.17",
-        "vue-template-es2015-compiler": "1.6.0"
+        "chalk": "^1.1.1",
+        "convert-source-map": "^1.2.0",
+        "cssnano": "^3.3.2",
+        "hash-sum": "^1.0.2",
+        "json5": "^0.5.1",
+        "lru-cache": "^4.0.0",
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.10",
+        "postcss-selector-parser": "^2.0.0",
+        "source-map": "^0.5.6",
+        "through": "^2.3.6",
+        "vue-hot-reload-api": "^2.0.1",
+        "vue-template-compiler": "^2.0.0-alpha.8",
+        "vue-template-es2015-compiler": "^1.2.2"
       }
     },
     "vuex": {
@@ -8309,7 +9099,7 @@
       "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
       "dev": true,
       "requires": {
-        "defaults": "1.0.3"
+        "defaults": "^1.0.3"
       }
     },
     "webidl-conversions": {
@@ -8326,7 +9116,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "tr46": "0.0.3"
+        "tr46": "~0.0.1"
       }
     },
     "whet.extend": {
@@ -8340,7 +9130,7 @@
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
@@ -8354,7 +9144,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "^1.0.2 || 2"
       }
     },
     "window-size": {
@@ -8368,8 +9158,8 @@
       "integrity": "sha1-7v0VTp550sjTQXtkeo8U2f7M4U4=",
       "dev": true,
       "requires": {
-        "acorn": "1.2.2",
-        "acorn-globals": "1.0.9"
+        "acorn": "^1.0.1",
+        "acorn-globals": "^1.0.3"
       },
       "dependencies": {
         "acorn": {
@@ -8380,6 +9170,13 @@
         }
       }
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "optional": true
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -8391,8 +9188,8 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
@@ -8412,9 +9209,9 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.2",
-        "ultron": "1.1.1"
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
       }
     },
     "xml-name-validator": {
@@ -8430,8 +9227,8 @@
       "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "dev": true,
       "requires": {
-        "sax": "1.2.1",
-        "xmlbuilder": "9.0.7"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~9.0.1"
       }
     },
     "xmlbuilder": {
@@ -8472,20 +9269,20 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
       "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
       "requires": {
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.3",
-        "lodash.assign": "4.2.0",
-        "os-locale": "1.4.0",
-        "read-pkg-up": "1.0.1",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "1.0.2",
-        "which-module": "1.0.0",
-        "window-size": "0.2.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "2.4.1"
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "lodash.assign": "^4.0.3",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.1",
+        "which-module": "^1.0.0",
+        "window-size": "^0.2.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^2.4.1"
       }
     },
     "yargs-parser": {
@@ -8493,8 +9290,8 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
       "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
       "requires": {
-        "camelcase": "3.0.0",
-        "lodash.assign": "4.2.0"
+        "camelcase": "^3.0.0",
+        "lodash.assign": "^4.0.6"
       }
     },
     "yarn-or-npm": {
@@ -8503,7 +9300,7 @@
       "integrity": "sha1-RuOKr850w1DmwMynJxL8p0EPrZg=",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0"
+        "cross-spawn": "^5.0.0"
       }
     },
     "yauzl": {
@@ -8512,7 +9309,7 @@
       "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
       "dev": true,
       "requires": {
-        "fd-slicer": "1.0.1"
+        "fd-slicer": "~1.0.1"
       }
     },
     "yeast": {
@@ -8526,7 +9323,7 @@
       "integrity": "sha1-cKd0T9F4mi/rQa00GbMun9h5V7I=",
       "dev": true,
       "requires": {
-        "archiver": "0.11.0"
+        "archiver": "^0.11.0"
       }
     },
     "zip-stream": {
@@ -8535,9 +9332,9 @@
       "integrity": "sha1-TqeVqM4Z6fq0mjHR0IdyFBWfA6M=",
       "dev": true,
       "requires": {
-        "compress-commons": "0.1.6",
-        "lodash": "2.4.2",
-        "readable-stream": "1.0.34"
+        "compress-commons": "~0.1.0",
+        "lodash": "~2.4.1",
+        "readable-stream": "~1.0.26"
       },
       "dependencies": {
         "isarray": {
@@ -8558,10 +9355,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         }
       }
diff --git a/src/components/balances.vue b/src/components/balances.vue
index 4b57fed4..bcadc873 100644
--- a/src/components/balances.vue
+++ b/src/components/balances.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="balances mt-3">
-                <p class="mb-1 font-weight-bold small">Balances</p>
+                <p class="mb-1 font-weight-bold small">{{$t('balances_lbl')}}</p>
                 <table class="table small table-striped table-sm">
                     <tbody>                    
                         <tr v-for="balance in balances" :key="balance.id">
@@ -19,6 +19,7 @@ import store from '../store/index.js';
 
 export default {
   name: "Balances",
+  i18nOptions: { namespaces: "common" },
   data() {
     return {
       rawbalances: [],
diff --git a/src/components/create.vue b/src/components/create.vue
index 542903f8..961de80a 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -1,58 +1,58 @@
 <template>
         <div class="bottom ">
         <div id="step1" v-if="step==1">
-        <h4 class="h4 mt-3 font-weight-bold">Step 1</h4>        
-        <p class="my-3 font-weight-bold">Set a friendly name for your new wallet:</p>
-        <input type="text" id="inputWallet" class="form-control mb-3" v-bind:class="s1c" placeholder="Wallet Name" required="" v-model="walletname" v-on:focus="s1c=''">
+        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 1})}}</h4>        
+        <p class="my-3 font-weight-bold">{{$t('friendly_cta')}}</p>
+        <input type="text" id="inputWallet" class="form-control mb-3" v-bind:class="s1c" :placeholder="$t('walletname_placeholder')" required="" v-model="walletname" v-on:focus="s1c=''">
          <div class="row">
           <div class="col-6">
-            <router-link to="/" tag="button" class="btn btn-lg btn-primary btn-block" replace>Cancel</router-link>     
+            <router-link to="/" tag="button" class="btn btn-lg btn-primary btn-block" replace>{{$t('cancel_btn')}}</router-link>     
           </div>
           <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step2">Next</button>
+            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step2">{{$t('next_btn')}}</button>
           </div>
         </div>
         </div>
         <div id="step2"  v-if="step==2">
-        <h4 class="h4 mt-3 font-weight-bold">Step 2</h4>        
-        <p class="mb-2 font-weight-bold">Account Name</p>
-        <input type="text" id="inputAccount" class="form-control mb-3" placeholder="BTS Account Name" required="" v-model="accountname">
-        <p class="my-3 font-weight-normal">Please enter the private keys for your account below:</p>
-        <p class="mb-2 font-weight-bold">Active Authority</p>
-        <input type="text" id="inputActive" class="form-control mb-3 small" placeholder="Active Private Key" required="" v-model="activepk">
+        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 2})}}</h4>        
+        <p class="mb-2 font-weight-bold">{{$t('account_name',{ 'chain' : 'BTS'})}}</p>
+        <input type="text" id="inputAccount" class="form-control mb-3" :placeholder="$t('account_name',{ 'chain' : 'BTS'})" required="" v-model="accountname">
+        <p class="my-3 font-weight-normal">{{$t('keys_cta')}}</p>
+        <p class="mb-2 font-weight-bold">{{$t('active_authority')}}</p>
+        <input type="text" id="inputActive" class="form-control mb-3 small" :placeholder="$t('active_authority_placeholder')" required="" v-model="activepk">
         
-        <p class="mb-2 font-weight-bold">Memo Key</p>
-        <input type="text" id="inputMemo" class="form-control mb-3 small" placeholder="Memo Private Key" required="" v-model="memopk">
+        <p class="mb-2 font-weight-bold">{{$t('memo_authority')}}</p>
+        <input type="text" id="inputMemo" class="form-control mb-3 small" :placeholder="$t('memo_authority_placeholder')" required="" v-model="memopk">
         <b-form-checkbox id="incOwnerCB"
                      v-model="includeOwner"
                      value="1"
                      unchecked-value="0" class="mb-3">
-      Include Owner Key?
+      {{$t('include_owner_check')}}
     </b-form-checkbox>
     <div v-if="includeOwner==1">        
-        <input type="text" id="inputOwner" class="form-control mb-3 small" placeholder="Owner Private Key" required=""  v-model="ownerpk">
+        <input type="text" id="inputOwner" class="form-control mb-3 small" :placeholder="$t('owner_authority_placeholder')" required=""  v-model="ownerpk">
         </div>
         <div class="row">
           <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step1">Back</button>
+            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step1">{{$t('back_btn')}}</button>
           </div>
           <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step3">Next</button>
+            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step3">{{$t('next_btn')}}</button>
           </div>
         </div>
         </div>
         <div id="step3"  v-if="step==3">
-        <h4 class="h4 mt-3 font-weight-bold">Step 3</h4>   
-        <p class="mb-2 font-weight-bold">Set a password for this wallet:</p>
-        <input type="password" id="inputPass" class="form-control mb-3" placeholder="Password" required="" v-model="password">
-        <p class="mb-2 font-weight-bold">Confirm password:</p>
-        <input type="password" id="inputConfirmPass" class="form-control mb-3" placeholder="Confirm Password" required="" v-model="confirmpassword">
-        <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="verifyAndCreate">Next</button>
+        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 3})}}</h4>   
+        <p class="mb-2 font-weight-bold">{{$t('password_cta')}}</p>
+        <input type="password" id="inputPass" class="form-control mb-3" :placeholder="$t('password_placeholder')" required="" v-model="password">
+        <p class="mb-2 font-weight-bold">{{$t('confirm_cta')}}</p>
+        <input type="password" id="inputConfirmPass" class="form-control mb-3" :placeholder="$t('confirm_placeholder')" required="" v-model="confirmpassword">
+        <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="verifyAndCreate">{{$t('next_lbl')}}</button>
         </div>
         <b-modal id="loaderAnim" centered ref="loaderAnimModal" no-close-on-esc no-close-on-backdrop hide-header hide-header-close hide-footer title="Loading...">
         <div class="lds-roller"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
         </b-modal>
-        <b-modal id="error" centered ref="errorModal"  hide-footer title="Error">
+        <b-modal id="error" centered ref="errorModal"  hide-footer :title="$t('error_lbl')">
         {{errorMsg}}
         </b-modal>
         <p class="mt-2 mb-2 small">&copy; 2018 BitShares</p>        
@@ -66,6 +66,7 @@ import SecureLS from "secure-ls";
 
 export default {
   name: "create",
+  i18nOptions: { namespaces: "common" },
   data() {
     return {
       walletname: "",
@@ -89,7 +90,7 @@ export default {
     step2: function() {
       if (this.$data.walletname.trim() == "") {
         console.log("Cannot create a wallet with an empty name.");
-        this.$data.errorMsg = "Cannot create a wallet with an empty name.";
+        this.$data.errorMsg = this.$t('empty_wallet_error');
         this.$refs.errorModal.show();
         this.$data.s1c = "is-invalid";
       } else {
@@ -102,7 +103,7 @@ export default {
         ) {
           console.log("A wallet with this name already exists.");
 
-          this.$data.errorMsg = "A wallet with this name already exists.";
+          this.$data.errorMsg = this.$t('duplicate_wallet_error');
           this.$refs.errorModal.show();
           this.$data.s1c = "is-invalid";
         } else {
@@ -114,7 +115,7 @@ export default {
     step3: async function() {
       let apkey, mpkey, opkey;
       if (this.$data.accountname == "") {
-        this.$data.errorMsg = "You must specify your BTS account name.";
+        this.$data.errorMsg = this.$t('missing_account_error',{'chain': 'BTS'});
         this.$refs.errorModal.show();
         return;
       }
@@ -132,7 +133,7 @@ export default {
         }
       } catch (e) {
         console.log("Invalid Private Key format.");
-        this.$data.errorMsg = "Invalid Private Key format.";
+        this.$data.errorMsg = this.$t('invalid_key_error');
         this.$refs.errorModal.show();
         return;
       }
@@ -161,8 +162,7 @@ export default {
               console.log("Keys not verified for provided account name.");
               this.$refs.loaderAnimModal.hide();
               this.$refs.errorModal.show();
-              this.$data.errorMsg =
-                "Keys not verified for provided account name. Please check.";
+              this.$data.errorMsg = this.$t('unverified_account_error');
               return null;
             }
           });
@@ -180,7 +180,7 @@ export default {
         this.$data.password == ""
       ) {
         this.$refs.errorModal.show();
-        this.$data.errorMsg = "Passwords do not match!";
+        this.$data.errorMsg = this.$t('confirm_pass_error');
         return;
       }
 
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index a03c9a8c..793a8a04 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="row node-selector">
   <div class="col-2 p-0 text-center d-flex  justify-content-center">
-    <span class="align-self-center">Node:</span>
+    <span class="align-self-center">{{$t('node_lbl')}}</span>
   </div>
     <div class="col-8 p-0">
                         <div class="input-group mb-0">
@@ -22,6 +22,7 @@ import { nodeList } from "../config/config";
 
 export default {
   name: "NodeSelect",
+  i18nOptions: { namespaces: "common" },
   data() {
     return {
       nodes: nodeList,
diff --git a/src/components/start.vue b/src/components/start.vue
index fd399f01..c296a386 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -23,6 +23,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   name: "start",
+  i18nOptions: { namespaces: "common" },
   data() {
     return {
       walletpass: "",
diff --git a/src/translations/common/en.json b/src/translations/common/en.json
index fcf00ec7..3b32b41d 100644
--- a/src/translations/common/en.json
+++ b/src/translations/common/en.json
@@ -19,11 +19,11 @@
     "active_authority": "Active Authority",
     "owner_authority": "Owner Authority",
     "memo_authority": "Memo Authority",
-    "active_authority_placceholder": "Active Private Key",
-    "owner_authority_placeholder": "Owner Private Key",
+    "active_authority_placeholder": "Active Private Key",
     "memo_authority_placeholder": "Memo Private Key",
     "include_owner_check": "Include Owner Key?",
     "password_cta": "Set a password for this wallet:",
+    "confirm_cta": "Confirm password:",
     "confirm_placeholder": "Confirm password",
     "empty_wallet_error": "Can not create a wallet with an empty name.",
     "duplicate_wallet_error": "A wallet with this name already exists.",
@@ -32,5 +32,6 @@
     "unverified_account_error": "Could not verify keys for account name provided. Please check.",
     "confirm_pass_error": "Passwords do not match.",
     "balances_lbl": "Balances",
-    "node_lbl": "Node"
+    "error_lbl": "Error",
+    "node_lbl": "Node:"
 }
\ No newline at end of file

From 0885cfdd1240956260bef4903a9c8a6d6d47f5d5 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 11:46:08 +0300
Subject: [PATCH 05/35] Persist selected node

---
 src/components/create.vue          |  2 +-
 src/components/node-select.vue     | 10 ++++++----
 src/store/modules/SettingsStore.js | 22 +++++++++++++++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/components/create.vue b/src/components/create.vue
index 961de80a..589e527c 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -139,7 +139,7 @@ export default {
       }
       this.$refs.loaderAnimModal.show();
       let verified = await Apis.instance(
-        "wss://bts-seoul.clockwork.gr",
+         this.$store.state.SettingsStore.settings.selected_node,
         true
       ).init_promise.then(res => {
         return Apis.instance()
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index 793a8a04..2737e363 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -5,7 +5,7 @@
   </div>
     <div class="col-8 p-0">
                         <div class="input-group mb-0">
-                            <select class="form-control small" id="node-select" v-model="selectedNode">                                
+                            <select class="form-control small" id="node-select" v-model="selectedNode">
                                 <option v-for="node in nodes" v-bind:value="node.url" v-bind:key="node.url">{{node.url}}</option>
                             </select>
                         </div>
@@ -28,7 +28,7 @@ export default {
       nodes: nodeList,
       isConnected: false,
       api: null,
-      selectedNode: "wss://bts-seoul.clockwork.gr"
+      selectedNode: 'wss://bts-seoul.clockwork.gr'
     };
   },
   watch: {
@@ -45,14 +45,16 @@ export default {
           this.onClose
         ).init_promise.then(res => {
           console.log("Opened Node");
+          this.$store.dispatch("SettingsStore/setNode", { 'node': this.selectedNode })
           this.isConnected = true;          
         });
       });
     }
   },
-  mounted() {
+  mounted() {    
+    console.log(this.$store.state.SettingsStore.settings.selected_node);
     Apis.instance(
-      this.selectedNode,
+      this.$store.state.SettingsStore.settings.selected_node,
       true,
       10000,
       { enableCrypto: false, enableOrders: false },
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 69043ce6..4c43e8ae 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -16,10 +16,30 @@ const actions = {
             try  {
                 let settings=localStorage.getItem("settings");
                 if (settings && settings.length > 0) {
-                    commit(LOAD_SETTINGS, settings);
+
+                    commit(LOAD_SETTINGS, JSON.parse(settings));
                 }else{
                     localStorage.setItem("settings", JSON.stringify(initialState.settings));
+                    commit(LOAD_SETTINGS, JSON.parse(initialState.settings));
+                }
+                resolve();
+            } catch (e) {
+                reject();
+            }
+        });
+    },
+    setNode({commit},payload) {
+        return new Promise((resolve, reject) => {
+            try  {
+                let settings=localStorage.getItem("settings");
+                if (settings && settings.length > 0) {
+                    settings=JSON.parse(settings)
+                }else{
+                    settings=initialState.settings;
                 }
+                settings.selected_node=payload.node;
+                localStorage.setItem("settings", JSON.stringify(settings));
+                commit(LOAD_SETTINGS, settings);
                 resolve();
             } catch (e) {
                 reject();

From aea4cbfa2e61f8458375f045bf8749d7da4208dc Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 11:48:19 +0300
Subject: [PATCH 06/35] Initial display fix

---
 src/components/node-select.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index 2737e363..a742b296 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -28,7 +28,7 @@ export default {
       nodes: nodeList,
       isConnected: false,
       api: null,
-      selectedNode: 'wss://bts-seoul.clockwork.gr'
+      selectedNode: this.$store.state.SettingsStore.settings.selected_node
     };
   },
   watch: {
@@ -52,9 +52,9 @@ export default {
     }
   },
   mounted() {    
-    console.log(this.$store.state.SettingsStore.settings.selected_node);
+    
     Apis.instance(
-      this.$store.state.SettingsStore.settings.selected_node,
+      this.selectedNode,
       true,
       10000,
       { enableCrypto: false, enableOrders: false },

From 72fc54cdbb32a0e07438b8588f3c1abe31f72c4d Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 12:25:05 +0300
Subject: [PATCH 07/35] Lang Picker  WIP

---
 src/components/lang-select.vue     | 36 ++++++++++++++++++++++++++++++
 src/components/start.vue           |  5 ++++-
 src/config/i18n.js                 | 12 ++++++++++
 src/store/modules/SettingsStore.js |  3 ++-
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 src/components/lang-select.vue
 create mode 100644 src/config/i18n.js

diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
new file mode 100644
index 00000000..228cfeac
--- /dev/null
+++ b/src/components/lang-select.vue
@@ -0,0 +1,36 @@
+<template>
+
+<div class="row lang-selector">
+    <div class="col-12 p-0">
+                        <div class="input-group mb-0">
+                            <select class="form-control small" id="lang-select" v-model="selectedLang">
+                                <option v-for="loc in locales" v-bind:value="loc['code']" v-bind:key="loc['code']">{{loc['code']}}</option>
+                            </select>
+                        </div>
+                    </div>
+                    </div>
+</template>
+
+<script>
+import { locales } from "../config/i18n.js";
+
+
+export default {
+  name: "LangSelect",
+  i18nOptions: { namespaces: "common" },
+  data() {
+    return {
+     locales:locales,
+     selectedlang: this.$store.state.SettingsStore.settings.locale
+    };
+  },
+  watch: {
+    selectedLang: function() {
+      console.log("Switching Lang.");
+      this.$store.dispatch("SettingsStore/setLocale", { 'locale': this.selectedLang });
+    }
+  },
+  mounted() {
+  }
+};
+</script>
diff --git a/src/components/start.vue b/src/components/start.vue
index c296a386..c48ad7f1 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="bottom">
       <div class="content">
+            <LangSelect ref="langswitch"></LangSelect>
         <p class="mt-3 mb-3 font-weight-normal" v-if="!hasWallet"><em>{{ $t('no_wallet') }}</em></p>
         <router-link to="/create" tag="button" v-if="!hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('start_cta') }}</router-link>        
         <select class="form-control my-3" id="wallet-select" v-model="selectedWallet"  v-if="hasWallet" v-on:change="passincorrect=''">                                
@@ -19,7 +20,8 @@
     </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from 'vuex';
+import LangSelect from "./lang-select";
 
 export default {
   name: "start",
@@ -46,6 +48,7 @@ export default {
       return this.$store.state.BeetStore.walletlist;
     }
   },
+  components: { LangSelect },
   methods: {
     unlockWallet() {      
       this.$store
diff --git a/src/config/i18n.js b/src/config/i18n.js
new file mode 100644
index 00000000..dee64248
--- /dev/null
+++ b/src/config/i18n.js
@@ -0,0 +1,12 @@
+export const defaultLocale = 'en' 
+export const locales = [
+    {
+        code: 'en',
+        name: 'English',
+        dir: 'ltr',
+    },{
+        code: 'de',
+        name: 'Deutsch',
+        dir: 'ltr',
+    }
+]
\ No newline at end of file
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 4c43e8ae..7e8d7347 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -1,4 +1,5 @@
 import Vue from 'vue/dist/vue.js';
+import defaultLocale from '../../config/i18n.js'
 const LOAD_SETTINGS = 'LOAD_SETTINGS';
 
 
@@ -55,7 +56,7 @@ const getters = {
 
 const initialState = {
     'settings': {
-    'locale': 'en',
+    'locale': defaultLocale,
     'selected_node': 'wss://bts-seoul.clockwork.gr'
     }
 };

From 5de1dbf4c7f7e149e293ad0d3d1599ac9c22b964 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 13:42:25 +0300
Subject: [PATCH 08/35] Linting Fix

---
 .eslintrc.js                       |  15 +
 package-lock.json                  | 769 ++++++++++++++++++++++++++++-
 package.json                       |   4 +-
 src/components/balances.vue        | 187 ++++---
 src/components/create.vue          | 481 +++++++++++-------
 src/components/dashboard.vue       | 567 +++++++++++----------
 src/components/header-guest.vue    |  22 +-
 src/components/header-small.vue    |  30 +-
 src/components/lang-select.vue     |  63 +--
 src/components/node-select.vue     | 140 +++---
 src/components/start.vue           | 167 ++++---
 src/config/i18n.js                 |  22 +-
 src/lib/Action.js                  |   4 +-
 src/lib/BeetAPI.js                 |  12 +-
 src/lib/Operations.js              |   7 +-
 src/lib/Queue.js                   |   5 +-
 src/store/modules/BeetStore.js     |  80 +--
 src/store/modules/SettingsStore.js |  49 +-
 18 files changed, 1834 insertions(+), 790 deletions(-)
 create mode 100644 .eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 00000000..59db5bd9
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+    extends: [        
+        "eslint:recommended",
+        'plugin:vue/recommended'
+    ],
+    rules: {
+        'vue/script-indent': ['warn', 4, {
+          'baseIndent': 1
+        }],
+        'vue/html-indent': ['warn', 4, {
+          'baseIndent': 1
+        }],        
+        "no-console": 0
+    }
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 293f841d..bed517bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,63 @@
       "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
       "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA="
     },
+    "@babel/code-frame": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "js-tokens": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "@octokit/rest": {
       "version": "15.9.5",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-15.9.5.tgz",
@@ -118,6 +175,23 @@
         "acorn": "^2.1.0"
       }
     },
+    "acorn-jsx": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz",
+      "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
+          "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==",
+          "dev": true
+        }
+      }
+    },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
@@ -144,6 +218,12 @@
         "json-schema-traverse": "^0.3.0"
       }
     },
+    "ajv-keywords": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+      "dev": true
+    },
     "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
@@ -391,11 +471,32 @@
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
       "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
     },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
     "asap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz",
@@ -1630,11 +1731,26 @@
         "long": "~3"
       }
     },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
       "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
     },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
     "camelcase": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
@@ -1768,6 +1884,12 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
     "clap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
@@ -2446,6 +2568,21 @@
       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
       "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
     },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -2545,6 +2682,15 @@
       "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
       "dev": true
     },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
@@ -4183,17 +4329,314 @@
         }
       }
     },
+    "eslint": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz",
+      "integrity": "sha512-m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.5.3",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^4.0.0",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.1.0",
+        "is-resolvable": "^1.1.0",
+        "js-yaml": "^3.12.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.5",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.0",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^4.0.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+          "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chardet": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+          "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "external-editor": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+          "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+          "dev": true,
+          "requires": {
+            "chardet": "^0.7.0",
+            "iconv-lite": "^0.4.24",
+            "tmp": "^0.0.33"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "globals": {
+          "version": "11.7.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+          "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+          "dev": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "inquirer": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
+          "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.0",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.10",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.1.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz",
+          "integrity": "sha512-hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "semver": {
+          "version": "5.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+          "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        }
+      }
+    },
+    "eslint-plugin-vue": {
+      "version": "5.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0-beta.3.tgz",
+      "integrity": "sha512-EOQo3ax4CIM6Itcl522p4cGlSBgR/KZBJo2Xc29PWknbYH/DRZorGutF8NATUpbZ4HYOG+Gcyd1nL08iyYF3Tg==",
+      "dev": true,
+      "requires": {
+        "vue-eslint-parser": "^3.2.1"
+      }
+    },
+    "eslint-scope": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz",
+      "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.6.0",
+        "acorn-jsx": "^4.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
+          "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==",
+          "dev": true
+        }
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
     "estraverse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
       "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "esutils": {
       "version": "2.0.2",
@@ -4342,6 +4785,16 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
     "find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -4357,6 +4810,18 @@
       "integrity": "sha1-WKRmaX34piBc39vzlVNri9d3pfY=",
       "dev": true
     },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
+      }
+    },
     "flatpak-bundler": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/flatpak-bundler/-/flatpak-bundler-0.1.3.tgz",
@@ -4530,6 +4995,12 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
     "gar": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/gar/-/gar-1.0.3.tgz",
@@ -4733,6 +5204,20 @@
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
       "dev": true
     },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
     "gonzales-pe": {
       "version": "3.4.7",
       "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
@@ -5053,6 +5538,12 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
     "image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -5071,6 +5562,12 @@
       "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=",
       "dev": true
     },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -5278,6 +5775,30 @@
         "xtend": "^4.0.0"
       }
     },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -5301,6 +5822,12 @@
       "integrity": "sha1-CRtGoNZ8HtD+hfH4z93gBrslHUY=",
       "dev": true
     },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -5586,6 +6113,12 @@
         "jsonify": "~0.0.0"
       }
     },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -6304,6 +6837,12 @@
       "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
       "dev": true
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -6333,6 +6872,12 @@
         "stylus": "0.54.5"
       }
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
     "node-abi": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
@@ -6884,6 +7429,12 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -6961,6 +7512,12 @@
         }
       }
     },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "dev": true
+    },
     "popper.js": {
       "version": "1.14.4",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz",
@@ -7291,6 +7848,12 @@
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
       "dev": true
     },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
     "progress-stream": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
@@ -7525,6 +8088,12 @@
         "private": "^0.1.6"
       }
     },
+    "regexpp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz",
+      "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==",
+      "dev": true
+    },
     "regexpu-core": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
@@ -7604,6 +8173,16 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
     "requirefresh": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/requirefresh/-/requirefresh-2.1.0.tgz",
@@ -7632,6 +8211,12 @@
         "global-modules": "^1.0.0"
       }
     },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
     "resolve-package": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-package/-/resolve-package-1.0.1.tgz",
@@ -7953,6 +8538,23 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
+      }
+    },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
@@ -8404,6 +9006,106 @@
       "integrity": "sha512-UqMAK6BBBXu8qaDI5omlyV9iDpM9nQfgthaBOK0nlfXnMgiuOBv+meWG73CGeCCFRhOOOa2e4rvqYzfynzy5zg==",
       "dev": true
     },
+    "table": {
+      "version": "4.0.3",
+      "resolved": "http://registry.npmjs.org/table/-/table-4.0.3.tgz",
+      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.0.1",
+        "ajv-keywords": "^3.0.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+          "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "tabtab": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz",
@@ -8584,6 +9286,12 @@
         }
       }
     },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
     "thenify": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
@@ -8824,6 +9532,12 @@
         "utf8-byte-length": "^1.0.1"
       }
     },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -8959,6 +9673,23 @@
       "dev": true,
       "optional": true
     },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true
+        }
+      }
+    },
     "url": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
@@ -9038,6 +9769,31 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",
       "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ=="
     },
+    "vue-eslint-parser": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-3.2.2.tgz",
+      "integrity": "sha512-dprI6ggKCTwV22r+i8dtUGquiOCn063xyDmb7BV/BjG5Oc/m5EoMNrWevpvTcrlGuFZmYVPs5fgsu8UIxmMKzg==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^4.0.0",
+        "esquery": "^1.0.1",
+        "lodash": "^4.17.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "vue-functional-data-merge": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-2.0.6.tgz",
@@ -9204,6 +9960,15 @@
       "dev": true,
       "optional": true
     },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
diff --git a/package.json b/package.json
index bd85278c..26916a36 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,8 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "electron-forge": "^5.2.2",
-    "electron-prebuilt-compile": "2.0.7"
+    "electron-prebuilt-compile": "2.0.7",
+    "eslint": "^5.5.0",
+    "eslint-plugin-vue": "^5.0.0-beta.3"
   }
 }
diff --git a/src/components/balances.vue b/src/components/balances.vue
index bcadc873..22014534 100644
--- a/src/components/balances.vue
+++ b/src/components/balances.vue
@@ -1,101 +1,96 @@
 <template>
-<div class="balances mt-3">
-                <p class="mb-1 font-weight-bold small">{{$t('balances_lbl')}}</p>
-                <table class="table small table-striped table-sm">
-                    <tbody>                    
-                        <tr v-for="balance in balances" :key="balance.id">
-                            <td class="text-left"><span class="small">{{balance.prefix}}</span>{{balance.asset_name}}</td>
-                            <td class="text-right">{{balance.balance}}</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-    </template>
-    
+    <div class="balances mt-3">
+        <p class="mb-1 font-weight-bold small">{{ $t('balances_lbl') }}</p>
+        <table class="table small table-striped table-sm">
+            <tbody>
+                <tr
+                    v-for="balance in balances"
+                    :key="balance.id"
+                >
+                    <td class="text-left"><span class="small">{{ balance.prefix }}</span>{{ balance.asset_name }}</td>
+                    <td class="text-right">{{ balance.balance }}</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</template>
 <script>
-import { Apis } from "bitsharesjs-ws";
-import { setInterval } from "timers";
-import store from '../store/index.js';
+    import { Apis } from "bitsharesjs-ws";
 
-export default {
-  name: "Balances",
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {
-      rawbalances: [],
-      balances: []
-    };
-  },
-  methods: {
-    /*
-    refresh: function() {
-      let self=this;
-      this.$data.refresher=setInterval(function() {
-        self.getBalances();
-      },3000);
-    },
-    */
-    getBalances: async function() {
-      let result = await Apis.instance()
-        .db_api()
-        .exec("get_full_accounts", [[this.$store.state.BeetStore.wallet.accountID], false])
-        .then(res => {
-          this.$data.rawbalances = res[0][1].balances;
-          let neededassets = [];
-          for (var i = 0; i < res[0][1].balances.length; i++) {
-            neededassets.push(res[0][1].balances[i].asset_type);
-          }
-          return Apis.instance()
-            .db_api()
-            .exec("get_objects", [neededassets]);
-        });
-      this.$data.balances = [];
-      for (var i = 0; i < this.$data.rawbalances.length; i++) {
-        if (result[i].issuer == "1.2.0") {
-          this.$data.balances[i] = {
-            asset_type: this.$data.rawbalances[i].asset_type,
-            asset_name: result[i].symbol,
-            balance: this.$data.rawbalances[i].balance,
-            owner: result[i].issuer,
-            prefix: "BIT"
-          };
-        } else {
-          this.$data.balances[i] = {
-            asset_type: this.$data.rawbalances[i].asset_type,
-            asset_name: result[i].symbol,
-            rawbalance: this.$data.rawbalances[i].balance,
-            balance: this.formatMoney(
-              this.$data.rawbalances[i].balance /
-                Math.pow(10, result[i].precision),
-              result[i].precision
-            ),
-            owner: result[i].issuer,
-            prefix: ""
-          };
+    export default {
+        name: "Balances",
+        i18nOptions: { namespaces: "common" },
+        data() {
+            return {
+                rawbalances: [],
+                balances: []
+            };
+        },
+        mounted() {},
+        methods: {
+            getBalances: async function() {
+                let result = await Apis.instance()
+                    .db_api()
+                    .exec("get_full_accounts", [
+                        [this.$store.state.BeetStore.wallet.accountID],
+                        false
+                    ])
+                    .then(res => {
+                        this.$data.rawbalances = res[0][1].balances;
+                        let neededassets = [];
+                        for (var i = 0; i < res[0][1].balances.length; i++) {
+                            neededassets.push(res[0][1].balances[i].asset_type);
+                        }
+                        return Apis.instance()
+                            .db_api()
+                            .exec("get_objects", [neededassets]);
+                    });
+                this.$data.balances = [];
+                for (var i = 0; i < this.$data.rawbalances.length; i++) {
+                    if (result[i].issuer == "1.2.0") {
+                        this.$data.balances[i] = {
+                            asset_type: this.$data.rawbalances[i].asset_type,
+                            asset_name: result[i].symbol,
+                            balance: this.$data.rawbalances[i].balance,
+                            owner: result[i].issuer,
+                            prefix: "BIT"
+                        };
+                    } else {
+                        this.$data.balances[i] = {
+                            asset_type: this.$data.rawbalances[i].asset_type,
+                            asset_name: result[i].symbol,
+                            rawbalance: this.$data.rawbalances[i].balance,
+                            balance: this.formatMoney(
+                                this.$data.rawbalances[i].balance /
+                                    Math.pow(10, result[i].precision),
+                                result[i].precision
+                            ),
+                            owner: result[i].issuer,
+                            prefix: ""
+                        };
+                    }
+                }
+                return;
+            },
+            formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
+                var c = isNaN(decimals) ? 2 : Math.abs(decimals),
+                    d = decimal_sep || ".",
+                    t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
+                    sign = n < 0 ? "-" : "",
+                    i = parseInt((n = Math.abs(n).toFixed(c))) + "",
+                    j = (j = i.length) > 3 ? j % 3 : 0;
+                return (
+                    sign +
+                    (j ? i.substr(0, j) + t : "") +
+                    i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
+                    (c
+                        ? d +
+                            Math.abs(n - i)
+                                .toFixed(c)
+                                .slice(2)
+                        : "")
+                );
+            }
         }
-      }
-      return;
-    },
-    formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
-      var c = isNaN(decimals) ? 2 : Math.abs(decimals),
-        d = decimal_sep || ".",
-        t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
-        sign = n < 0 ? "-" : "",
-        i = parseInt((n = Math.abs(n).toFixed(c))) + "",
-        j = (j = i.length) > 3 ? j % 3 : 0;
-      return (
-        sign +
-        (j ? i.substr(0, j) + t : "") +
-        i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
-        (c
-          ? d +
-            Math.abs(n - i)
-              .toFixed(c)
-              .slice(2)
-          : "")
-      );
-    }
-  },
-  mounted() {}
-};
+    };
 </script>
diff --git a/src/components/create.vue b/src/components/create.vue
index 589e527c..ef0a5012 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -1,206 +1,305 @@
 <template>
-        <div class="bottom ">
-        <div id="step1" v-if="step==1">
-        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 1})}}</h4>        
-        <p class="my-3 font-weight-bold">{{$t('friendly_cta')}}</p>
-        <input type="text" id="inputWallet" class="form-control mb-3" v-bind:class="s1c" :placeholder="$t('walletname_placeholder')" required="" v-model="walletname" v-on:focus="s1c=''">
-         <div class="row">
-          <div class="col-6">
-            <router-link to="/" tag="button" class="btn btn-lg btn-primary btn-block" replace>{{$t('cancel_btn')}}</router-link>     
-          </div>
-          <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step2">{{$t('next_btn')}}</button>
-          </div>
-        </div>
-        </div>
-        <div id="step2"  v-if="step==2">
-        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 2})}}</h4>        
-        <p class="mb-2 font-weight-bold">{{$t('account_name',{ 'chain' : 'BTS'})}}</p>
-        <input type="text" id="inputAccount" class="form-control mb-3" :placeholder="$t('account_name',{ 'chain' : 'BTS'})" required="" v-model="accountname">
-        <p class="my-3 font-weight-normal">{{$t('keys_cta')}}</p>
-        <p class="mb-2 font-weight-bold">{{$t('active_authority')}}</p>
-        <input type="text" id="inputActive" class="form-control mb-3 small" :placeholder="$t('active_authority_placeholder')" required="" v-model="activepk">
-        
-        <p class="mb-2 font-weight-bold">{{$t('memo_authority')}}</p>
-        <input type="text" id="inputMemo" class="form-control mb-3 small" :placeholder="$t('memo_authority_placeholder')" required="" v-model="memopk">
-        <b-form-checkbox id="incOwnerCB"
-                     v-model="includeOwner"
-                     value="1"
-                     unchecked-value="0" class="mb-3">
-      {{$t('include_owner_check')}}
-    </b-form-checkbox>
-    <div v-if="includeOwner==1">        
-        <input type="text" id="inputOwner" class="form-control mb-3 small" :placeholder="$t('owner_authority_placeholder')" required=""  v-model="ownerpk">
-        </div>
-        <div class="row">
-          <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step1">{{$t('back_btn')}}</button>
-          </div>
-          <div class="col-6">
-            <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="step3">{{$t('next_btn')}}</button>
-          </div>
+    <div class="bottom ">
+        <div
+            v-if="step==1"
+            id="step1"
+        >
+            <h4 class="h4 mt-3 font-weight-bold">{{ $t('step_counter',{ 'step_no' : 1}) }}</h4>
+            <p class="my-3 font-weight-bold">{{ $t('friendly_cta') }}</p>
+            <input
+                id="inputWallet"
+                v-model="walletname"
+                type="text"
+                class="form-control mb-3"
+                :class="s1c"
+                :placeholder="$t('walletname_placeholder')"
+                required=""
+                @focus="s1c=''"
+            >
+            <div class="row">
+                <div class="col-6">
+                    <router-link
+                        to="/"
+                        tag="button"
+                        class="btn btn-lg btn-primary btn-block"
+                        replace
+                    >{{ $t('cancel_btn') }}</router-link>
+                </div>
+                <div class="col-6">
+                    <button
+                        class="btn btn-lg btn-primary btn-block"
+                        type="submit"
+                        @click="step2"
+                    >{{ $t('next_btn') }}</button>
+                </div>
+            </div>
         </div>
+        <div
+            v-if="step==2"
+            id="step2"
+        >
+            <h4 class="h4 mt-3 font-weight-bold">{{ $t('step_counter',{ 'step_no' : 2}) }}</h4>
+            <p class="mb-2 font-weight-bold">{{ $t('account_name',{ 'chain' : 'BTS'}) }}</p>
+            <input
+                id="inputAccount"
+                v-model="accountname"
+                type="text"
+                class="form-control mb-3"
+                :placeholder="$t('account_name',{ 'chain' : 'BTS'})"
+                required=""
+            >
+            <p class="my-3 font-weight-normal">{{ $t('keys_cta') }}</p>
+            <p class="mb-2 font-weight-bold">{{ $t('active_authority') }}</p>
+            <input
+                id="inputActive"
+                v-model="activepk"
+                type="text"
+                class="form-control mb-3 small"
+                :placeholder="$t('active_authority_placeholder')"
+                required=""
+            >
+
+            <p class="mb-2 font-weight-bold">{{ $t('memo_authority') }}</p>
+            <input
+                id="inputMemo"
+                v-model="memopk"
+                type="text"
+                class="form-control mb-3 small"
+                :placeholder="$t('memo_authority_placeholder')"
+                required=""
+            >
+            <b-form-checkbox
+                id="incOwnerCB"
+                v-model="includeOwner"
+                value="1"
+                unchecked-value="0"
+                class="mb-3"
+            >
+                {{ $t('include_owner_check') }}
+            </b-form-checkbox>
+            <div v-if="includeOwner==1">
+                <input
+                    id="inputOwner"
+                    v-model="ownerpk"
+                    type="text"
+                    class="form-control mb-3 small"
+                    :placeholder="$t('owner_authority_placeholder')"
+                    required=""
+                >
+            </div>
+            <div class="row">
+                <div class="col-6">
+                    <button
+                        class="btn btn-lg btn-primary btn-block"
+                        type="submit"
+                        @click="step1"
+                    >{{ $t('back_btn') }}</button>
+                </div>
+                <div class="col-6">
+                    <button
+                        class="btn btn-lg btn-primary btn-block"
+                        type="submit"
+                        @click="step3"
+                    >{{ $t('next_btn') }}</button>
+                </div>
+            </div>
         </div>
-        <div id="step3"  v-if="step==3">
-        <h4 class="h4 mt-3 font-weight-bold">{{$t('step_counter',{ 'step_no' : 3})}}</h4>   
-        <p class="mb-2 font-weight-bold">{{$t('password_cta')}}</p>
-        <input type="password" id="inputPass" class="form-control mb-3" :placeholder="$t('password_placeholder')" required="" v-model="password">
-        <p class="mb-2 font-weight-bold">{{$t('confirm_cta')}}</p>
-        <input type="password" id="inputConfirmPass" class="form-control mb-3" :placeholder="$t('confirm_placeholder')" required="" v-model="confirmpassword">
-        <button class="btn btn-lg btn-primary btn-block" type="submit" v-on:click="verifyAndCreate">{{$t('next_lbl')}}</button>
+        <div
+            v-if="step==3"
+            id="step3"
+        >
+            <h4 class="h4 mt-3 font-weight-bold">{{ $t('step_counter',{ 'step_no' : 3}) }}</h4>
+            <p class="mb-2 font-weight-bold">{{ $t('password_cta') }}</p>
+            <input
+                id="inputPass"
+                v-model="password"
+                type="password"
+                class="form-control mb-3"
+                :placeholder="$t('password_placeholder')"
+                required=""
+            >
+            <p class="mb-2 font-weight-bold">{{ $t('confirm_cta') }}</p>
+            <input
+                id="inputConfirmPass"
+                v-model="confirmpassword"
+                type="password"
+                class="form-control mb-3"
+                :placeholder="$t('confirm_placeholder')"
+                required=""
+            >
+            <button
+                class="btn btn-lg btn-primary btn-block"
+                type="submit"
+                @click="verifyAndCreate"
+            >{{ $t('next_lbl') }}</button>
         </div>
-        <b-modal id="loaderAnim" centered ref="loaderAnimModal" no-close-on-esc no-close-on-backdrop hide-header hide-header-close hide-footer title="Loading...">
-        <div class="lds-roller"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
+        <b-modal
+            id="loaderAnim"
+            ref="loaderAnimModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header
+            hide-header-close
+            hide-footer
+            title="Loading..."
+        >
+            <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
         </b-modal>
-        <b-modal id="error" centered ref="errorModal"  hide-footer :title="$t('error_lbl')">
-        {{errorMsg}}
+        <b-modal
+            id="error"
+            ref="errorModal"
+            centered
+            hide-footer
+            :title="$t('error_lbl')"
+        >
+            {{ errorMsg }}
         </b-modal>
-        <p class="mt-2 mb-2 small">&copy; 2018 BitShares</p>        
-        </div>        
+        <p class="mt-2 mb-2 small">&copy; 2018 BitShares</p>
+    </div>
 </template>
 
 <script>
-import { PrivateKey, key } from "bitsharesjs";
-import { Apis } from "bitsharesjs-ws";
-import SecureLS from "secure-ls";
+    import { PrivateKey } from "bitsharesjs";
+    import { Apis } from "bitsharesjs-ws";
 
-export default {
-  name: "create",
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {
-      walletname: "",
-      accountname: "",
-      accountID: "",
-      activepk: "",
-      ownerpk: "",
-      memopk: "",
-      password: "",
-      confirmpassword: "",
-      step: 1,
-      s1c: "",
-      includeOwner: 0,
-      errorMsg: ""
-    };
-  },
-  methods: {
-    step1: function() {
-      this.$data.step = 1;
-    },
-    step2: function() {
-      if (this.$data.walletname.trim() == "") {
-        console.log("Cannot create a wallet with an empty name.");
-        this.$data.errorMsg = this.$t('empty_wallet_error');
-        this.$refs.errorModal.show();
-        this.$data.s1c = "is-invalid";
-      } else {
-        let wallets = JSON.parse(localStorage.getItem("wallets"));
+    export default {
+        name: "Create",
+        i18nOptions: { namespaces: "common" },
+        data() {
+            return {
+                walletname: "",
+                accountname: "",
+                accountID: "",
+                activepk: "",
+                ownerpk: "",
+                memopk: "",
+                password: "",
+                confirmpassword: "",
+                step: 1,
+                s1c: "",
+                includeOwner: 0,
+                errorMsg: ""
+            };
+        },
+        methods: {
+            step1: function() {
+                this.$data.step = 1;
+            },
+            step2: function() {
+                if (this.$data.walletname.trim() == "") {
+                    console.log("Cannot create a wallet with an empty name.");
+                    this.$data.errorMsg = this.$t('empty_wallet_error');
+                    this.$refs.errorModal.show();
+                    this.$data.s1c = "is-invalid";
+                } else {
+                    let wallets = JSON.parse(localStorage.getItem("wallets"));
 
-        if (
-          wallets &&
-          wallets.filter(wallet => wallet.name === this.$data.walletname.trim())
-            .length > 0
-        ) {
-          console.log("A wallet with this name already exists.");
+                    if (
+                        wallets &&
+                        wallets.filter(wallet => wallet.name === this.$data.walletname.trim())
+                        .length > 0
+                    ) {
+                        console.log("A wallet with this name already exists.");
 
-          this.$data.errorMsg = this.$t('duplicate_wallet_error');
-          this.$refs.errorModal.show();
-          this.$data.s1c = "is-invalid";
-        } else {
-          this.$data.walletname = this.$data.walletname.trim();
-          this.$data.step = 2;
-        }
-      }
-    },
-    step3: async function() {
-      let apkey, mpkey, opkey;
-      if (this.$data.accountname == "") {
-        this.$data.errorMsg = this.$t('missing_account_error',{'chain': 'BTS'});
-        this.$refs.errorModal.show();
-        return;
-      }
-      try {
-        apkey = PrivateKey.fromWif(this.activepk)
-          .toPublicKey()
-          .toString("BTS");
-        mpkey = PrivateKey.fromWif(this.memopk)
-          .toPublicKey()
-          .toString("BTS");
-        if (this.$data.includeOwner == 1) {
-          opkey = PrivateKey.fromWif(this.ownerpk)
-            .toPublicKey()
-            .toString("BTS");
-        }
-      } catch (e) {
-        console.log("Invalid Private Key format.");
-        this.$data.errorMsg = this.$t('invalid_key_error');
-        this.$refs.errorModal.show();
-        return;
-      }
-      this.$refs.loaderAnimModal.show();
-      let verified = await Apis.instance(
-         this.$store.state.SettingsStore.settings.selected_node,
-        true
-      ).init_promise.then(res => {
-        return Apis.instance()
-          .db_api()
-          .exec("get_full_accounts", [[this.accountname], false])
-          .then(res => {
-            // TODO: Better verification
-            if (
-              res[0][1].account.active.key_auths[0][0] == apkey &&
-              (res[0][1].account.owner.key_auths[0][0] == opkey ||
-                this.$data.includeOwner == 0) &&
-              res[0][1].account.options.memo_key == mpkey
-            ) {
-              console.log(
-                "Keys verified. Account ID is: " + res[0][1].account.id
-              );
-              this.$refs.loaderAnimModal.hide();
-              return res[0][1].account.id;
-            } else {
-              console.log("Keys not verified for provided account name.");
-              this.$refs.loaderAnimModal.hide();
-              this.$refs.errorModal.show();
-              this.$data.errorMsg = this.$t('unverified_account_error');
-              return null;
-            }
-          });
-      });
-      if (verified != null) {
-        this.$data.accountID = verified;
-        this.$data.step = 3;
-      } else {
-        return;
-      }
-    },
-    verifyAndCreate: async function() {
-      if (
-        this.$data.password != this.$data.confirmpassword ||
-        this.$data.password == ""
-      ) {
-        this.$refs.errorModal.show();
-        this.$data.errorMsg = this.$t('confirm_pass_error');
-        return;
-      }
+                        this.$data.errorMsg = this.$t('duplicate_wallet_error');
+                        this.$refs.errorModal.show();
+                        this.$data.s1c = "is-invalid";
+                    } else {
+                        this.$data.walletname = this.$data.walletname.trim();
+                        this.$data.step = 2;
+                    }
+                }
+            },
+            step3: async function() {
+                let apkey, mpkey, opkey;
+                if (this.$data.accountname == "") {
+                    this.$data.errorMsg = this.$t('missing_account_error',{'chain': 'BTS'});
+                    this.$refs.errorModal.show();
+                    return;
+                }
+                try {
+                    apkey = PrivateKey.fromWif(this.activepk)
+                        .toPublicKey()
+                        .toString("BTS");
+                    mpkey = PrivateKey.fromWif(this.memopk)
+                        .toPublicKey()
+                        .toString("BTS");
+                    if (this.$data.includeOwner == 1) {
+                        opkey = PrivateKey.fromWif(this.ownerpk)
+                            .toPublicKey()
+                            .toString("BTS");
+                    }
+                } catch (e) {
+                    console.log("Invalid Private Key format.");
+                    this.$data.errorMsg = this.$t('invalid_key_error');
+                    this.$refs.errorModal.show();
+                    return;
+                }
+                this.$refs.loaderAnimModal.show();
+                let verified = await Apis.instance(
+                    this.$store.state.SettingsStore.settings.selected_node,
+                    true
+                ).init_promise.then(() => {
+                    return Apis.instance()
+                        .db_api()
+                        .exec("get_full_accounts", [[this.accountname], false])
+                        .then(res => {
+                            // TODO: Better verification
+                            if (
+                                res[0][1].account.active.key_auths[0][0] == apkey &&
+                                (res[0][1].account.owner.key_auths[0][0] == opkey ||
+                                this.$data.includeOwner == 0) &&
+                                res[0][1].account.options.memo_key == mpkey
+                            ) {
+                                console.log(
+                                    "Keys verified. Account ID is: " + res[0][1].account.id
+                                );
+                                this.$refs.loaderAnimModal.hide();
+                                return res[0][1].account.id;
+                            } else {
+                                console.log("Keys not verified for provided account name.");
+                                this.$refs.loaderAnimModal.hide();
+                                this.$refs.errorModal.show();
+                                this.$data.errorMsg = this.$t('unverified_account_error');
+                                return null;
+                            }
+                    });
+                });
+                if (verified != null) {
+                    this.$data.accountID = verified;
+                    this.$data.step = 3;
+                } else {
+                    return;
+                }
+            },
+            verifyAndCreate: async function() {
+                if (
+                    this.$data.password != this.$data.confirmpassword ||
+                    this.$data.password == ""
+                ) {
+                    this.$refs.errorModal.show();
+                    this.$data.errorMsg = this.$t('confirm_pass_error');
+                    return;
+                }
+
+                this.$refs.loaderAnimModal.show();
 
-      this.$refs.loaderAnimModal.show();
-      
-      if (this.$data.accountID !== null) {
-       this.$store
-        .dispatch("BeetStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
-          accountName: this.$data.accountname,
-          accountID: this.$data.accountID,
-          keys: {
-            active: this.activepk,
-            owner: this.ownerpk,
-            memo: this.memopk
-          }
+                if (this.$data.accountID !== null) {
+                    this.$store
+                        .dispatch("BeetStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
+                            accountName: this.$data.accountname,
+                            accountID: this.$data.accountID,
+                            keys: {
+                                active: this.activepk,
+                                owner: this.ownerpk,
+                                memo: this.memopk
+                            }
+                        }
+                        });
+                    this.$router.replace("/dashboard");
+                }
+            }
         }
-        });
-        this.$router.replace("/dashboard");
-      }
-    }
-  }
-};
+    };
 </script>
\ No newline at end of file
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 1400feec..7c21797a 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -1,272 +1,337 @@
 <template>
-        <div class="bottom ">
-<div class="content">
+    <div class="bottom ">
+        <div class="content">
             <div class="row mb-2">
                 <div class="col-12 text-center account py-2">
-                      {{accountName}} ({{accountID}})                      
+                    {{ accountName }} ({{ accountID }})
                 </div>
             </div>
-            <Balances ref="balancetable"></Balances>
-            </div>
-            <NodeSelect  @first-connect="getBalances" ref="apinode"></NodeSelect>
-             
-        <b-modal id="accountRequest" centered ref="accountReqModal" no-close-on-esc no-close-on-backdrop hide-header-close hide-footer title="Account Details Request" >
-            The page/app <strong>'{{this.$data.incoming.origin}}'</strong> is requesting to access your account ID.<br/>
-                    <br/>
-                    Do you want to allow access?
-                    <b-btn class="mt-3" variant="success" block @click="allowAccess">Allow</b-btn>
-                    <b-btn class="mt-1" variant="danger" block @click="denyAccess">Deny</b-btn>
+            <Balances ref="balancetable" />
+        </div>
+        <NodeSelect
+            ref="apinode"
+            @first-connect="getBalances"
+        />
+        <b-modal
+            id="accountRequest"
+            ref="accountReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            title="Account Details Request"
+        >
+            The page/app <strong>'{{ this.$data.incoming.origin }}'</strong> is requesting to access your account ID.<br>
+            <br>
+            Do you want to allow access?
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="allowAccess"
+            >Allow</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="denyAccess"
+            >Deny</b-btn>
         </b-modal>
-        <b-modal id="transactionRequest" centered ref="transactionReqModal" no-close-on-esc no-close-on-backdrop hide-header-close hide-footer title="Transaction Request" >
+        <b-modal
+            id="transactionRequest"
+            ref="transactionReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            title="Transaction Request"
+        >
             The page/app
-                    <strong>'{{this.$data.incoming.origin}}'</strong> has submitted the following transaction.
-                    <br/>
-                    <br/>
-                    <pre class="text-left custom-content"><code>
-{ 
-  op_type: {{this.$data.incoming.op_type}},
-  op_data: {{this.$data.incoming.op_data}}
+            <strong>'{{ this.$data.incoming.origin }}'</strong> has submitted the following transaction.
+            <br>
+            <br>
+            <pre class="text-left custom-content"><code>
+{
+  op_type: {{ this.$data.incoming.op_type }},
+  op_data: {{ this.$data.incoming.op_data }}
 }
-                      </code></pre>
-                     Do you want to execute it?
-                    <b-btn class="mt-3" variant="success" block @click="acceptTx">Sign &amp; Broadcast</b-btn>
-                    <b-btn class="mt-1" variant="danger" block @click="rejectTx">Ignore</b-btn>
+            </code></pre>
+            Do you want to execute it?
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="acceptTx"
+            >Sign &amp; Broadcast</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="rejectTx"
+            >Ignore</b-btn>
         </b-modal>
-        <b-modal id="genericRequest" centered ref="genericReqModal" no-close-on-esc no-close-on-backdrop hide-header-close hide-footer title="Incoming Request">
+        <b-modal
+            id="genericRequest"
+            ref="genericReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            title="Incoming Request"
+        >
             The page/app
-                    <strong>'{{this.$data.incoming.origin}}'</strong> {{this.$data.genericmsg}}:
-                    <br/>
-                    <br/>
-                      <pre class="text-left custom-content"><code>
-{{this.$data.specifics}}
-                      </code></pre>
-                    
-                    
-                    <b-btn class="mt-3" variant="success" block @click="acceptGeneric">Approve</b-btn>
-                    <b-btn class="mt-1" variant="danger" block @click="rejectGeneric">Ignore</b-btn>
+            <strong>'{{ this.$data.incoming.origin }}'</strong> {{ this.$data.genericmsg }}:
+            <br>
+            <br>
+            <pre class="text-left custom-content"><code>
+{{ this.$data.specifics }}
+            </code></pre>
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="acceptGeneric"
+            >Approve</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="rejectGeneric"
+            >Ignore</b-btn>
         </b-modal>
-        <b-modal id="loaderAnim" centered ref="loaderAnimModal" no-close-on-esc no-close-on-backdrop hide-header hide-header-close hide-footer title="Loading...">
-        <div class="lds-roller"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
+        <b-modal
+            id="loaderAnim"
+            ref="loaderAnimModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header
+            hide-header-close
+            hide-footer
+            title="Loading..."
+        >
+            <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
         </b-modal>
-        </div>
-        
+    </div>
+
 </template>
 
 <script>
-import BeetServer from "../lib/BeetServer";
-import Operations from "../lib/Operations";
-import NodeSelect from "./node-select";
-import Balances from "./balances";
-import { Apis } from "bitsharesjs-ws";
-import {
-  PrivateKey,
-  TransactionHelper,
-  Aes,
-  TransactionBuilder
-} from "bitsharesjs";
+    import BeetServer from "../lib/BeetServer";
+    import Operations from "../lib/Operations";
+    import NodeSelect from "./node-select";
+    import Balances from "./balances";
+    import { Apis } from "bitsharesjs-ws";
+    import {
+        PrivateKey,
+        TransactionBuilder
+    } from "bitsharesjs";
 
-export default {
-  name: "dashboard",
-  i18nOptions: { namespaces: ["common","operations"] },
-  data() {
-    return {
-      text: "",
-      api: {},
-      incoming: "",
-      genericmsg: "",
-      specifics: ""
-    };
-  },
-  computed: {
-    accountName () {
-      return this.$store.state.BeetStore.wallet.accountName
-    },
-    accountID () {
-      return this.$store.state.BeetStore.wallet.accountID
-    }
-  },
-  components: { NodeSelect, Balances },
-  mounted() {
-    this.$refs.loaderAnimModal.show();
-    BeetServer.initialize(this);
-    BeetServer.open();
-    
-  },
-  methods: {
-    getBalances: async function() {
-      
+    export default {
+        name: "Dashboard",
+        i18nOptions: { namespaces: ["common", "operations"] },
+        components: { NodeSelect, Balances },
+        data() {
+            return {
+                text: "",
+                api: {},
+                incoming: "",
+                genericmsg: "",
+                specifics: ""
+            };
+        },
+        computed: {
+            accountName() {
+                return this.$store.state.BeetStore.wallet.accountName;
+            },
+            accountID() {
+                return this.$store.state.BeetStore.wallet.accountID;
+            }
+        },
+        mounted() {
+            this.$refs.loaderAnimModal.show();
+            BeetServer.initialize(this);
+            BeetServer.open();
+        },
+        methods: {
+            getBalances: async function() {
+                await this.$refs.balancetable.getBalances();
+                this.$refs.loaderAnimModal.hide();
+            },
+            requestAccess: function(request) {
+                this.$store.dispatch("BeetStore/notifyUser", {
+                    notify: "request"
+                });
+                this.$data.incoming = {};
+                this.$data.incoming = request;
+                this.$refs.accountReqModal.show();
+                return new Promise((res, rej) => {
+                    this.$data.incoming.accept = res;
+                    this.$data.incoming.reject = rej;
+                });
+            },
+            requestVote: async function(request) {
+                this.$store.dispatch("BeetStore/notifyUser", {
+                    notify: "request"
+                });
+                this.$data.incoming = {};
+                this.$data.incoming = request;
 
-      await this.$refs.balancetable.getBalances();
-      this.$refs.loaderAnimModal.hide();
-    },
-    requestAccess: function(request) {
-       this.$store
-        .dispatch("BeetStore/notifyUser", { notify: 'request'
-        })
-      this.$data.incoming = {};
-      this.$data.incoming = request;
-      this.$refs.accountReqModal.show();
-      return new Promise((res, rej) => {
-        this.$data.incoming.accept = res;
-        this.$data.incoming.reject = rej;
-      });
-    },
-    requestVote: async function(request) {
-      this.$store
-        .dispatch("BeetStore/notifyUser", { notify: 'request'
-        })
-      this.$data.incoming = {};
-      this.$data.incoming = request;
+                this.$data.incoming.action = "vote";
+                let entity_id = this.$data.incoming.id.split(".");
+                if (entity_id[0] != "1") {
+                    return Promise.reject();
+                }
+                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
+                    return Promise.reject();
+                }
 
-      this.$data.incoming.action = "vote";
-      let entity_id = this.$data.incoming.id.split(".");
-      if (entity_id[0] != "1") {
-        return Promise.reject();
-      }
-      if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
-        return Promise.reject();
-      }
+                let entity = "";
+                let objdata = await Apis.instance()
+                    .db_api()
+                    .exec("get_objects", [[this.$data.incoming.id]]);
 
-      let entity = "";
-      let objdata = await Apis.instance()
-        .db_api()
-        .exec("get_objects", [[this.$data.incoming.id]]);
+                let objextradata;
+                switch (entity_id[1]) {
+                case "5":
+                    entity = "committee member";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].committee_member_account]]);
+                    this.$data.specifics =
+                        "Commitee member: " +
+                        objextradata[0].name +
+                        "\nCommittee Member ID: " +
+                        this.$data.incoming.id;
+                    this.$data.incoming.vote_id = objdata[0].vote_id;
+                    break;
+                case "6":
+                    entity = "witness";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].witness_account]]);
+                    this.$data.specifics =
+                        "Witness: " +
+                        objextradata[0].name +
+                        "\nWitness ID: " +
+                        this.$data.incoming.id;
+                    this.$data.incoming.vote_id = objdata[0].vote_id;
+                    break;
+                case "14":
+                    entity = "worker proposal";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].worker_account]]);
+                    this.$data.specifics =
+                        "Proposal: " +
+                        objdata[0].name +
+                        "\nProposal ID: " +
+                        this.$data.incoming.id +
+                        "\nDaily Pay: " +
+                        this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
+                        "BTS\nWorker: " +
+                        objextradata[0].name;
+                    this.$data.incoming.vote_id = objdata[0].vote_for;
+                    break;
+                }
+                this.$data.genericmsg = "wants you to vote for the following " + entity;
+                this.$refs.genericReqModal.show();
+                return new Promise((res, rej) => {
+                    this.$data.incoming.acceptgen = res;
+                    this.$data.incoming.rejectgen = rej;
+                });
+            },
+            requestTx: function(request) {
+                this.$root.$data.ipc.send("notify", "request");
+                this.$data.incoming = {};
+                this.$data.incoming = request;
+                this.$refs.transactionReqModal.show();
+                return new Promise((res, rej) => {
+                    this.$data.incoming.accepttx = res;
+                    this.$data.incoming.rejecttx = rej;
+                });
+            },
+            allowAccess: function() {
+                this.$refs.accountReqModal.hide();
+                this.$data.incoming.accept({
+                    account: this.$store.state.BeetStore.wallet.accountName,
+                    id: this.$store.state.BeetStore.wallet.accountID
+                });
+            },
+            denyAccess: function() {
+                this.$refs.accountReqModal.hide();
+                this.$data.incoming.reject({});
+            },
+            acceptTx: async function() {
+                let tr = new TransactionBuilder();
+                Apis.instance().init_promise.then(() => {
+                    tr.add_type_operation(
+                        this.$data.incoming.op_type,
+                        this.$data.incoming.op_data
+                    );
+                    tr.set_required_fees().then(async () => {
+                        this.$refs.loaderAnimModal.show();
+                        let pKey = PrivateKey.fromWif(
+                            this.$store.state.BeetStore.wallet.keys.active
+                        );
+                        tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+                        let id = await tr.broadcast();
+                        this.$data.incoming.accepttx({ id: id });
+                        this.$refs.transactionReqModal.hide();
+                        this.$refs.loaderAnimModal.hide();
+                    });
+                });
+            },
+            rejectTx: function() {
+                this.$refs.transactionReqModal.hide();
+                this.$data.incoming.rejecttx({});
+            },
+            acceptGeneric: async function() {
+                let tr = new TransactionBuilder();
+                let operation = await Operations.generate(
+                    this.$data.incoming,
+                    this.$store.state.BeetStore.wallet.accountID
+                );
 
-      let objextradata;
-      switch (entity_id[1]) {
-        case "5":
-          entity = "committee member";
-          objextradata = await Apis.instance()
-            .db_api()
-            .exec("get_objects", [[objdata[0].committee_member_account]]);
-          this.$data.specifics =
-            "Commitee member: " +
-            objextradata[0].name +
-            "\nCommittee Member ID: " +
-            this.$data.incoming.id;
-          this.$data.incoming.vote_id = objdata[0].vote_id;
-          break;
-        case "6":
-          entity = "witness";
-          objextradata = await Apis.instance()
-            .db_api()
-            .exec("get_objects", [[objdata[0].witness_account]]);
-          this.$data.specifics =
-            "Witness: " +
-            objextradata[0].name +
-            "\nWitness ID: " +
-            this.$data.incoming.id;
-          this.$data.incoming.vote_id = objdata[0].vote_id;
-          break;
-        case "14":
-          entity = "worker proposal";
-          objextradata = await Apis.instance()
-            .db_api()
-            .exec("get_objects", [[objdata[0].worker_account]]);
-          this.$data.specifics =
-            "Proposal: " +
-            objdata[0].name +
-            "\nProposal ID: " +
-            this.$data.incoming.id +
-            "\nDaily Pay: " +
-            this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
-            "BTS\nWorker: " +
-            objextradata[0].name;
-          this.$data.incoming.vote_id = objdata[0].vote_for;
-          break;
-      }      
-      this.$data.genericmsg = "wants you to vote for the following " + entity;      
-      this.$refs.genericReqModal.show();      
-      return new Promise((res, rej) => {
-        this.$data.incoming.acceptgen = res;
-        this.$data.incoming.rejectgen = rej;
-      });
-    },
-    requestTx: function(request) {
-      this.$root.$data.ipc.send("notify", "request");
-      this.$data.incoming = {};
-      this.$data.incoming = request;
-      this.$refs.transactionReqModal.show();
-      return new Promise((res, rej) => {
-        this.$data.incoming.accepttx = res;
-        this.$data.incoming.rejecttx = rej;
-      });
-    },
-    allowAccess: function() {
-      this.$refs.accountReqModal.hide();
-      this.$data.incoming.accept({
-        account: this.$store.state.BeetStore.wallet.accountName,
-        id: this.$store.state.BeetStore.wallet.accountID
-      });
-    },
-    denyAccess: function() {
-      this.$refs.accountReqModal.hide();
-      this.$data.incoming.reject({});
-    },
-    acceptTx: async function() {
-      let tr = new TransactionBuilder();
-      Apis.instance().init_promise.then(res => {
-        tr.add_type_operation(
-          this.$data.incoming.op_type,
-          this.$data.incoming.op_data
-        );
-        tr.set_required_fees().then(async () => {
-          this.$refs.loaderAnimModal.show();
-          let pKey = PrivateKey.fromWif(this.$store.state.BeetStore.wallet.keys.active);
-          tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());          
-          let id = await tr.broadcast();
-          this.$data.incoming.accepttx({ id: id });
-          this.$refs.transactionReqModal.hide();
-          this.$refs.loaderAnimModal.hide();
-        });
-      });
-    },
-    rejectTx: function() {
-      this.$refs.transactionReqModal.hide();
-      this.$data.incoming.rejecttx({});
-    },
-    acceptGeneric: async function() {
-      let tr = new TransactionBuilder();
-      let res = await Apis.instance().init_promise;
-      let operation = await Operations.generate(
-        this.$data.incoming,
-        this.$store.state.BeetStore.wallet.accountID
-      );
-      
-      tr.add_type_operation(operation.op_type, operation.op_data);
-      tr.set_required_fees().then(async () => {
-        this.$refs.loaderAnimModal.show();
-        let pKey = PrivateKey.fromWif(this.$store.state.BeetStore.wallet.keys.active);
-        tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());        
-        let id = await tr.broadcast();
-        this.$data.incoming.acceptgen({ id: id });
-        this.$refs.genericReqModal.hide();
-        this.$refs.loaderAnimModal.hide();
-      });
-    },
-    rejectGeneric: function() {
-      this.$refs.genericReqModal.hide();
-      this.$data.incoming.rejectgen({});
-    },
-    formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
-      var c = isNaN(decimals) ? 2 : Math.abs(decimals),
-        d = decimal_sep || ".",
-        t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
-        sign = n < 0 ? "-" : "",
-        i = parseInt((n = Math.abs(n).toFixed(c))) + "",
-        j = (j = i.length) > 3 ? j % 3 : 0;
-      return (
-        sign +
-        (j ? i.substr(0, j) + t : "") +
-        i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
-        (c
-          ? d +
-            Math.abs(n - i)
-              .toFixed(c)
-              .slice(2)
-          : "")
-      );
-    }
-  }
-};
+                tr.add_type_operation(operation.op_type, operation.op_data);
+                tr.set_required_fees().then(async () => {
+                    this.$refs.loaderAnimModal.show();
+                    let pKey = PrivateKey.fromWif(
+                        this.$store.state.BeetStore.wallet.keys.active
+                    );
+                    tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+                    let id = await tr.broadcast();
+                    this.$data.incoming.acceptgen({ id: id });
+                    this.$refs.genericReqModal.hide();
+                    this.$refs.loaderAnimModal.hide();
+                });
+            },
+            rejectGeneric: function() {
+                this.$refs.genericReqModal.hide();
+                this.$data.incoming.rejectgen({});
+            },
+            formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
+                var c = isNaN(decimals) ? 2 : Math.abs(decimals),
+                    d = decimal_sep || ".",
+                    t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
+                    sign = n < 0 ? "-" : "",
+                    i = parseInt((n = Math.abs(n).toFixed(c))) + "",
+                    j = (j = i.length) > 3 ? j % 3 : 0;
+                return (
+                    sign +
+                    (j ? i.substr(0, j) + t : "") +
+                    i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
+                    (c
+                        ? d +
+                            Math.abs(n - i)
+                                .toFixed(c)
+                                .slice(2)
+                        : "")
+                );
+            }
+        }
+    };
 </script>
diff --git a/src/components/header-guest.vue b/src/components/header-guest.vue
index 201aa391..1933aa30 100644
--- a/src/components/header-guest.vue
+++ b/src/components/header-guest.vue
@@ -1,16 +1,22 @@
 <template>
     <div class="top">
-        <img class="mb-4" src="img/bitshares.png" alt="" width="150" height="150">
+        <img
+            class="mb-4"
+            src="img/bitshares.png"
+            alt=""
+            width="150"
+            height="150"
+        >
         <h3 class="h3 mb-3 font-weight-normal">{{ $t("welcome" ) }}</h3>
     </div>
 </template>
 
 <script>
-export default { 
-  name: "headerGuest",  
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {};
-  }
-};
+    export default {
+        name: "HeaderGuest",
+        i18nOptions: { namespaces: "common" },
+        data() {
+            return {};
+        }
+    };
 </script>
\ No newline at end of file
diff --git a/src/components/header-small.vue b/src/components/header-small.vue
index bafc5946..6478fed7 100644
--- a/src/components/header-small.vue
+++ b/src/components/header-small.vue
@@ -1,19 +1,25 @@
 <template>
-        <div class="top">
-            <div class="row">
-                <div class="col-12 d-flex smallHeader">
-                    <img class="" src="img/bitshares.png" alt="" width="56" height="56">                
-                    <h4 class="h4 font-weight-normal align-self-center">Beet</h4>
-                </div>
+    <div class="top">
+        <div class="row">
+            <div class="col-12 d-flex smallHeader">
+                <img
+                    class=""
+                    src="img/bitshares.png"
+                    alt=""
+                    width="56"
+                    height="56"
+                >
+                <h4 class="h4 font-weight-normal align-self-center">Beet</h4>
             </div>
         </div>
+    </div>
 </template>
 
 <script>
-export default {
-  name: "headerSmall",
-  data() {
-    return {};
-  }
-};
+    export default {
+        name: "HeaderSmall",
+        data() {
+            return {};
+        }
+    };
 </script>
\ No newline at end of file
diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index 228cfeac..193bf673 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -1,36 +1,43 @@
 <template>
-
-<div class="row lang-selector">
-    <div class="col-12 p-0">
-                        <div class="input-group mb-0">
-                            <select class="form-control small" id="lang-select" v-model="selectedLang">
-                                <option v-for="loc in locales" v-bind:value="loc['code']" v-bind:key="loc['code']">{{loc['code']}}</option>
-                            </select>
-                        </div>
-                    </div>
-                    </div>
+    <div class="row lang-selector">
+        <div class="col-12 p-0">
+            <div class="input-group mb-0">
+                <select 
+                    id="lang-select" 
+                    v-model="selectLang" 
+                    class="form-control small"
+                >
+                    <option 
+                        v-for="loc in locales" 
+                        :key="loc['code']" 
+                        :value="loc['code']"
+                    >{{ loc['code'] }}</option>
+                </select>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script>
-import { locales } from "../config/i18n.js";
+    import { locales } from "../config/i18n.js";
 
 
-export default {
-  name: "LangSelect",
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {
-     locales:locales,
-     selectedlang: this.$store.state.SettingsStore.settings.locale
+    export default {
+        name: "LangSelect",
+        i18nOptions: { namespaces: "common" },
+        data() {
+            return {
+                locales:locales,
+                selectLang: this.$store.state.SettingsStore.settings.locale
+            };
+        },
+        watch: {
+            selectLang: function() {
+                console.log("Switching Lang.");
+                this.$store.dispatch("SettingsStore/setLocale", { 'locale': this.selectLang });
+            }
+        },
+        mounted() {
+        }
     };
-  },
-  watch: {
-    selectedLang: function() {
-      console.log("Switching Lang.");
-      this.$store.dispatch("SettingsStore/setLocale", { 'locale': this.selectedLang });
-    }
-  },
-  mounted() {
-  }
-};
 </script>
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index a742b296..0d866c42 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -1,71 +1,83 @@
 <template>
-<div class="row node-selector">
-  <div class="col-2 p-0 text-center d-flex  justify-content-center">
-    <span class="align-self-center">{{$t('node_lbl')}}</span>
-  </div>
-    <div class="col-8 p-0">
-                        <div class="input-group mb-0">
-                            <select class="form-control small" id="node-select" v-model="selectedNode">
-                                <option v-for="node in nodes" v-bind:value="node.url" v-bind:key="node.url">{{node.url}}</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-2 p-0 text-center d-flex  justify-content-center">
-                                <span class="status align-self-center" v-bind:class="{connected: isConnected,disconnected: !isConnected}"></span>
-                    </div>
-                    </div>
+    <div class="row node-selector">
+        <div class="col-2 p-0 text-center d-flex  justify-content-center">
+            <span class="align-self-center">{{ $t('node_lbl') }}</span>
+        </div>
+        <div class="col-8 p-0">
+            <div class="input-group mb-0">
+                <select 
+                    id="node-select" 
+                    v-model="selectedNode" 
+                    class="form-control small"
+                >
+                    <option 
+                        v-for="node in nodes" 
+                        :key="node.url" 
+                        :value="node.url"
+                    >{{ node.url }}</option>
+                </select>
+            </div>
+        </div>
+        <div class="col-2 p-0 text-center d-flex  justify-content-center">
+            <span 
+                class="status align-self-center" 
+                :class="{connected: isConnected,disconnected: !isConnected}"
+            />
+        </div>
+    </div>
 </template>
 
 <script>
-import { Apis } from "bitsharesjs-ws";
-import { nodeList } from "../config/config";
+    import { Apis } from "bitsharesjs-ws";
+    import { nodeList } from "../config/config";
 
-export default {
-  name: "NodeSelect",
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {
-      nodes: nodeList,
-      isConnected: false,
-      api: null,
-      selectedNode: this.$store.state.SettingsStore.settings.selected_node
+    export default {
+        name: "NodeSelect",
+        i18nOptions: { namespaces: "common" },
+        data() {
+            return {
+                nodes: nodeList,
+                isConnected: false,
+                api: null,
+                selectedNode: this.$store.state.SettingsStore.settings.selected_node
+            };
+        },
+        watch: {
+            selectedNode: function() {
+                console.log("Switching Node.");
+                Apis.close().then(() => {
+                    console.log("Closed Node.");
+                    this.isConnected = false;
+                    Apis.instance(
+                        this.selectedNode,
+                        true,
+                        10000,
+                        { enableCrypto: false, enableOrders: false },
+                        this.onClose
+                    ).init_promise.then(() => {
+                        console.log("Opened Node");
+                        this.$store.dispatch("SettingsStore/setNode", {
+                            node: this.selectedNode
+                        });
+                        this.isConnected = true;
+                    });
+                });
+            }
+        },
+        mounted() {
+            Apis.instance(
+                this.selectedNode,
+                true,
+                10000,
+                { enableCrypto: false, enableOrders: false },
+                this.onClose
+            ).init_promise.then(() => {
+                this.isConnected = true;
+                this.$emit("first-connect");
+            });
+        },
+        onClose() {
+            this.isConnected = false;
+        }
     };
-  },
-  watch: {
-    selectedNode: function() {
-      console.log("Switching Node.");
-      Apis.close().then(() => {
-        console.log("Closed Node.");
-        this.isConnected = false;
-        Apis.instance(
-          this.selectedNode,
-          true,
-          10000,
-          { enableCrypto: false, enableOrders: false },
-          this.onClose
-        ).init_promise.then(res => {
-          console.log("Opened Node");
-          this.$store.dispatch("SettingsStore/setNode", { 'node': this.selectedNode })
-          this.isConnected = true;          
-        });
-      });
-    }
-  },
-  mounted() {    
-    
-    Apis.instance(
-      this.selectedNode,
-      true,
-      10000,
-      { enableCrypto: false, enableOrders: false },
-      this.onClose
-    ).init_promise.then(res => {
-      this.isConnected = true;      
-      this.$emit("first-connect");      
-    });
-  },
-  onClose() {
-    this.isConnected = false;
-  }
-};
 </script>
diff --git a/src/components/start.vue b/src/components/start.vue
index c48ad7f1..175f25ff 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -1,70 +1,119 @@
 <template>
     <div class="bottom">
-      <div class="content">
-            <LangSelect ref="langswitch"></LangSelect>
-        <p class="mt-3 mb-3 font-weight-normal" v-if="!hasWallet"><em>{{ $t('no_wallet') }}</em></p>
-        <router-link to="/create" tag="button" v-if="!hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('start_cta') }}</router-link>        
-        <select class="form-control my-3" id="wallet-select" v-model="selectedWallet"  v-if="hasWallet" v-on:change="passincorrect=''">                                
-          <option selected disabled value="0">{{ $t('select_wallet') }}</option>
-          <option v-for="wallet in walletlist" v-bind:value="wallet.id" v-bind:key="wallet.id">{{wallet.name}}</option>
-        </select>
-        <input type="password" id="inputPassword" class="form-control mb-3" :placeholder=" $t('password_placeholder')" required="" v-model="walletpass"  v-if="hasWallet" v-bind:class="passincorrect" v-on:focus="passincorrect=''">        
-        <button class="btn btn-lg btn-primary btn-block" type="submit" v-if="hasWallet" v-on:click="unlockWallet">{{ $t('unlock_cta') }}</button>
-        <p class="my-2 font-weight-normal" v-if="hasWallet"><em>{{ $t('or') }}</em></p>
-        <router-link to="/create" tag="button" v-if="hasWallet" class="btn btn-lg btn-primary btn-block" replace>{{ $t('create_cta') }}</router-link>     
+        <div class="content">
+            <LangSelect ref="langswitch" />
+            <p 
+                v-if="!hasWallet" 
+                class="mt-3 mb-3 font-weight-normal"
+            ><em>{{ $t('no_wallet') }}</em></p>
+            <router-link 
+                v-if="!hasWallet" 
+                to="/create" 
+                tag="button" 
+                class="btn btn-lg btn-primary btn-block" 
+                replace
+            >{{ $t('start_cta') }}</router-link>        
+            <select 
+                v-if="hasWallet" 
+                id="wallet-select" 
+                v-model="selectedWallet" 
+                class="form-control my-3" 
+                @change="passincorrect=''"
+            >                                
+                <option 
+                    selected 
+                    disabled 
+                    value="0"
+                >{{ $t('select_wallet') }}</option>
+                <option 
+                    v-for="wallet in walletlist" 
+                    :key="wallet.id" 
+                    :value="wallet.id"
+                >{{ wallet.name }}</option>
+            </select>
+            <input 
+                v-if="hasWallet" 
+                id="inputPassword" 
+                v-model="walletpass" 
+                type="password" 
+                class="form-control mb-3" 
+                :placeholder=" $t('password_placeholder')" 
+                required="" 
+                :class="passincorrect" 
+                @focus="passincorrect=''"
+            >        
+            <button 
+                v-if="hasWallet" 
+                class="btn btn-lg btn-primary btn-block" 
+                type="submit" 
+                @click="unlockWallet"
+            >{{ $t('unlock_cta') }}</button>
+            <p 
+                v-if="hasWallet" 
+                class="my-2 font-weight-normal"
+            ><em>{{ $t('or') }}</em></p>
+            <router-link 
+                v-if="hasWallet" 
+                to="/create" 
+                tag="button" 
+                class="btn btn-lg btn-primary btn-block" 
+                replace
+            >{{ $t('create_cta') }}</router-link>     
         </div>
-        <b-modal id="error" centered ref="errorModal"  hide-footer title="Error">
-        {{errorMsg}}
+        <b-modal 
+            id="error" 
+            ref="errorModal" 
+            centered 
+            hide-footer 
+            title="Error"
+        >
+            {{ errorMsg }}
         </b-modal>
         <p class="mt-2 mb-2 small">&copy; 2018 BitShares</p>
     </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import LangSelect from "./lang-select";
+    import LangSelect from "./lang-select";
 
-export default {
-  name: "start",
-  i18nOptions: { namespaces: "common" },
-  data() {
-    return {
-      walletpass: "",
-      selectedWallet: "0",
-      passincorrect: "",
-      errorMsg: ""
-      
+    export default {
+        name: "Start",
+        i18nOptions: { namespaces: "common" },
+        components: { LangSelect },
+        data() {
+            return {
+                walletpass: "",
+                selectedWallet: "0",
+                passincorrect: "",
+                errorMsg: ""
+            };
+        },
+        computed: {
+            hasWallet() {
+                return this.$store.state.BeetStore.hasWallet;
+            },
+            walletlist() {
+                return this.$store.state.BeetStore.walletlist;
+            }
+        },
+        mounted() {
+            this.$store.dispatch("BeetStore/loadWallets", {});
+        },
+        methods: {
+            unlockWallet() {
+                this.$store
+                    .dispatch("BeetStore/getWallet", {
+                        wallet_id: this.$data.selectedWallet,
+                        wallet_pass: this.$data.walletpass
+                    })
+                    .then(() => {
+                        this.$router.replace("/dashboard");
+                    })
+                    .catch(() => {
+                        this.$data.passincorrect = "is-invalid";
+                        this.$data.errorMsg = "Invalid Password.";
+                        this.$refs.errorModal.show();
+                });
+            }
+        }
     };
-  },
-  mounted() {
-     this.$store
-        .dispatch("BeetStore/loadWallets", {
-        })
-  },
-  computed: {    
-    hasWallet() {
-      return this.$store.state.BeetStore.hasWallet;     
-    },
-    walletlist() {
-      return this.$store.state.BeetStore.walletlist;
-    }
-  },
-  components: { LangSelect },
-  methods: {
-    unlockWallet() {      
-      this.$store
-        .dispatch("BeetStore/getWallet", {
-          wallet_id: this.$data.selectedWallet,
-          wallet_pass: this.$data.walletpass
-        })
-        .then(response => {
-          this.$router.replace("/dashboard");
-        })
-        .catch(response => {
-          this.$data.passincorrect = "is-invalid";
-          this.$data.errorMsg = "Invalid Password.";
-          this.$refs.errorModal.show();
-        });
-    }
-  }
-};
 </script>
\ No newline at end of file
diff --git a/src/config/i18n.js b/src/config/i18n.js
index dee64248..160b7678 100644
--- a/src/config/i18n.js
+++ b/src/config/i18n.js
@@ -1,12 +1,10 @@
-export const defaultLocale = 'en' 
-export const locales = [
-    {
-        code: 'en',
-        name: 'English',
-        dir: 'ltr',
-    },{
-        code: 'de',
-        name: 'Deutsch',
-        dir: 'ltr',
-    }
-]
\ No newline at end of file
+export const defaultLocale = 'en';
+export const locales = [{
+    code: 'en',
+    name: 'English',
+    dir: 'ltr',
+}, {
+    code: 'de',
+    name: 'Deutsch',
+    dir: 'ltr',
+}]
\ No newline at end of file
diff --git a/src/lib/Action.js b/src/lib/Action.js
index 23a70645..7e15eec6 100644
--- a/src/lib/Action.js
+++ b/src/lib/Action.js
@@ -1,8 +1,6 @@
-import * as Actions from './Actions';
-
 export default class Action {
 
-    constructor(_type = '', _payload = {}, _resolver = '', _domain = '') {
+    constructor(_type = '', _payload = {}) {
         this.type = _type;
         this.payload = _payload;
     }
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 5458a789..d1db1fb1 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -1,17 +1,15 @@
 import * as Actions from './Actions';
-import Action from './Action';
 import Queue from './Queue';
 
 var popupQ = new Queue();
 export default class BeetAPI {
 
-    static async handler(request, vueInst) {
-        const action = Action.fromJson(request);
+    static async handler(request, vueInst) {        
         if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
         let result;
         if (popupQ.isEmpty()) {
             let qresolve;
-            let queued = new Promise(function (resolve, reject) {
+            let queued = new Promise(function (resolve) {
                 qresolve = resolve
             });
             popupQ.enqueue({
@@ -32,7 +30,7 @@ export default class BeetAPI {
                 }
             }
             let qresolve;
-            let queued = new Promise(function (resolve, reject) {
+            let queued = new Promise(function (resolve) {
                 qresolve = resolve
             });
             let previous = popupQ.tail();
@@ -40,7 +38,7 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            let done = await previous.promise;
+            await previous.promise;
             result = await this[request.type](request, vueInst);
             let finished = popupQ.dequeue();
             finished.resolve(true);
@@ -50,7 +48,7 @@ export default class BeetAPI {
 
     static async [Actions.GET_ACCOUNT](request, vue) {
         try {
-            let response = await vue.requestAccess(request.payload);            
+            let response = await vue.requestAccess(request.payload);
             return {
                 id: request.id,
                 result: response
diff --git a/src/lib/Operations.js b/src/lib/Operations.js
index 69e97fd9..3f40826c 100644
--- a/src/lib/Operations.js
+++ b/src/lib/Operations.js
@@ -1,4 +1,6 @@
-import {Apis} from "bitsharesjs-ws";
+import {
+    Apis
+} from "bitsharesjs-ws";
 
 export default class operations {
 
@@ -7,7 +9,7 @@ export default class operations {
         let op_data;
         let api = Apis.instance();
         switch (data.action) {
-            case 'vote':
+            case 'vote': {
                 op_type = 'account_update';
                 let accounts = await api.db_api()
                     .exec("get_objects", [
@@ -32,6 +34,7 @@ export default class operations {
                 op_data = updateObject;
 
                 break;
+            }
         }
         return {
             op_type: op_type,
diff --git a/src/lib/Queue.js b/src/lib/Queue.js
index efa04b19..dabf21c4 100644
--- a/src/lib/Queue.js
+++ b/src/lib/Queue.js
@@ -1,4 +1,4 @@
-class Queue {
+export default class Queue {
     constructor() {
         this.items = [];
     }
@@ -27,5 +27,4 @@ class Queue {
     size() {
         return this.items.length;
     }
-}
-module.exports = Queue;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/store/modules/BeetStore.js b/src/store/modules/BeetStore.js
index 2ccefbdc..24a652b4 100644
--- a/src/store/modules/BeetStore.js
+++ b/src/store/modules/BeetStore.js
@@ -60,29 +60,33 @@ const actions = {
         commit
     }, payload) {
         return new Promise((resolve, reject) => {
-            let wallets = localStorage.getItem("wallets");
-            let walletid = uuid();
-            let newwallet = {
-                id: walletid,
-                name: payload.walletname
-            };
-            if (!wallets) {
-                wallets = [];
-            } else {
-                wallets = JSON.parse(wallets);
+            try {
+                let wallets = localStorage.getItem("wallets");
+                let walletid = uuid();
+                let newwallet = {
+                    id: walletid,
+                    name: payload.walletname
+                };
+                if (!wallets) {
+                    wallets = [];
+                } else {
+                    wallets = JSON.parse(wallets);
+                }
+                wallets.push(newwallet);
+                localStorage.setItem("wallets", JSON.stringify(wallets));
+                commit(SET_WALLET_STATUS, true);
+                commit(SET_WALLETLIST, wallets);
+                let ls = new SecureLS({
+                    encodingType: "aes",
+                    isCompression: true,
+                    encryptionSecret: payload.password
+                });
+                ls.set(walletid, payload.walletdata);
+                commit(GET_WALLET, payload.walletdata);
+                resolve();
+            } catch (e) {
+                reject();
             }
-            wallets.push(newwallet);
-            localStorage.setItem("wallets", JSON.stringify(wallets));
-            commit(SET_WALLET_STATUS, true);
-            commit(SET_WALLETLIST, wallets);
-            let ls = new SecureLS({
-                encodingType: "aes",
-                isCompression: true,
-                encryptionSecret: payload.password
-            });
-            ls.set(walletid, payload.walletdata);
-            commit(GET_WALLET, payload.walletdata);
-            resolve();
         });
     },
     loadWallets({
@@ -91,16 +95,16 @@ const actions = {
 
         return new Promise((resolve, reject) => {
             try {
-            let wallets = JSON.parse(localStorage.getItem("wallets"));
-            if (wallets && wallets.length > 0) {
-                commit(SET_WALLET_STATUS, true);
-                commit(SET_WALLETLIST, wallets);
-                resolve('Wallets Found');
-            } else {
-                resolve('Wallets not found');
-            }
-            }catch(e) {
-                resolve('Wallets not found');
+                let wallets = JSON.parse(localStorage.getItem("wallets"));
+                if (wallets && wallets.length > 0) {
+                    commit(SET_WALLET_STATUS, true);
+                    commit(SET_WALLETLIST, wallets);
+                    resolve('Wallets Found');
+                } else {
+                    resolve('Wallets not found');
+                }
+            } catch (e) {
+                reject('Wallets not found');
             }
         });
     },
@@ -108,10 +112,12 @@ const actions = {
         commit
     }, payload) {
         return new Promise((resolve, reject) => {
-
-            commit(REQ_NOTIFY, payload.notify);
-            resolve();
-
+            if (payload.notify == 'request') {
+                commit(REQ_NOTIFY, payload.notify);
+                resolve();
+            } else {
+                reject();
+            }
         });
     }
 }
@@ -125,7 +131,7 @@ const getters = {
 
 
 const initialState = {
-    wallet: {},
+    wallet: wallet,
     hasWallet: false,
     walletlist: [],
     ipc: ipcRenderer
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 7e8d7347..a35fae83 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -14,12 +14,12 @@ const actions = {
         commit
     }) {
         return new Promise((resolve, reject) => {
-            try  {
-                let settings=localStorage.getItem("settings");
+            try {
+                let settings = localStorage.getItem("settings");
                 if (settings && settings.length > 0) {
 
                     commit(LOAD_SETTINGS, JSON.parse(settings));
-                }else{
+                } else {
                     localStorage.setItem("settings", JSON.stringify(initialState.settings));
                     commit(LOAD_SETTINGS, JSON.parse(initialState.settings));
                 }
@@ -29,16 +29,38 @@ const actions = {
             }
         });
     },
-    setNode({commit},payload) {
+    setNode({
+        commit
+    }, payload) {
+        return new Promise((resolve, reject) => {
+            try {
+                let settings = localStorage.getItem("settings");
+                if (settings && settings.length > 0) {
+                    settings = JSON.parse(settings)
+                } else {
+                    settings = initialState.settings;
+                }
+                settings.selected_node = payload.node;
+                localStorage.setItem("settings", JSON.stringify(settings));
+                commit(LOAD_SETTINGS, settings);
+                resolve();
+            } catch (e) {
+                reject();
+            }
+        });
+    },
+    setLocale({
+        commit
+    }, payload) {
         return new Promise((resolve, reject) => {
-            try  {
-                let settings=localStorage.getItem("settings");
+            try {
+                let settings = localStorage.getItem("settings");
                 if (settings && settings.length > 0) {
-                    settings=JSON.parse(settings)
-                }else{
-                    settings=initialState.settings;
+                    settings = JSON.parse(settings)
+                } else {
+                    settings = initialState.settings;
                 }
-                settings.selected_node=payload.node;
+                settings.locale = payload.locale;
                 localStorage.setItem("settings", JSON.stringify(settings));
                 commit(LOAD_SETTINGS, settings);
                 resolve();
@@ -50,14 +72,13 @@ const actions = {
 }
 
 
-const getters = {
-};
+const getters = {};
 
 
 const initialState = {
     'settings': {
-    'locale': defaultLocale,
-    'selected_node': 'wss://bts-seoul.clockwork.gr'
+        'locale': defaultLocale,
+        'selected_node': 'wss://bts-seoul.clockwork.gr'
     }
 };
 

From 39eb005350dd9c04e52454a445ba01b6da0e02a4 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 4 Sep 2018 17:54:07 +0300
Subject: [PATCH 09/35] Language switcher implemented - CSS missing

---
 package-lock.json                  |  5 ++
 package.json                       |  1 +
 src/components/header-guest.vue    |  3 +
 src/components/header-small.vue    |  6 +-
 src/components/lang-select.vue     | 46 ++++++++------
 src/components/start.vue           | 97 +++++++++++++++---------------
 src/config/i18n.js                 | 12 ++--
 src/css/main.css                   | 35 ++++++++++-
 src/index.html                     |  9 ++-
 src/store/modules/SettingsStore.js |  7 ++-
 src/translations/common/de.json    | 37 ++++++++++++
 11 files changed, 176 insertions(+), 82 deletions(-)
 create mode 100644 src/translations/common/de.json

diff --git a/package-lock.json b/package-lock.json
index bed517bb..719a4469 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9804,6 +9804,11 @@
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz",
       "integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA=="
     },
+    "vue-multiselect": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.0.tgz",
+      "integrity": "sha512-mEhApxZ6MUISGLuGDy0RF5UlAKUgG/Qq0DWYE/C+CA1h6ZszM3cHfpNFfFm2AMWLclY2SAWpY1HlQLjsw8WnvQ=="
+    },
     "vue-router": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",
diff --git a/package.json b/package.json
index 26916a36..c4d15844 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "socket.io": "^2.1.1",
     "uuid": "^3.3.2",
     "vue": "^2.5.17",
+    "vue-multiselect": "^2.1.0",
     "vue-router": "^3.0.1",
     "vueify": "^9.4.1",
     "vuex": "^3.0.1"
diff --git a/src/components/header-guest.vue b/src/components/header-guest.vue
index 1933aa30..4ee9414e 100644
--- a/src/components/header-guest.vue
+++ b/src/components/header-guest.vue
@@ -8,13 +8,16 @@
             height="150"
         >
         <h3 class="h3 mb-3 font-weight-normal">{{ $t("welcome" ) }}</h3>
+        <LangSelect ref="langswitch" />
     </div>
 </template>
 
 <script>
+    import LangSelect from "./lang-select";
     export default {
         name: "HeaderGuest",
         i18nOptions: { namespaces: "common" },
+        components: { LangSelect },
         data() {
             return {};
         }
diff --git a/src/components/header-small.vue b/src/components/header-small.vue
index 6478fed7..002778de 100644
--- a/src/components/header-small.vue
+++ b/src/components/header-small.vue
@@ -9,15 +9,19 @@
                     width="56"
                     height="56"
                 >
-                <h4 class="h4 font-weight-normal align-self-center">Beet</h4>
+                <h4 class="h4 font-weight-normal align-self-center">{{ $t('app_name') }}</h4>
+                <LangSelect ref="langswitch" />
             </div>
         </div>
     </div>
 </template>
 
 <script>
+    import LangSelect from "./lang-select";
     export default {
         name: "HeaderSmall",
+        i18nOptions: { namespaces: "common" },
+        components: { LangSelect },
         data() {
             return {};
         }
diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index 193bf673..420e23ff 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -1,30 +1,41 @@
 <template>
-    <div class="row lang-selector">
-        <div class="col-12 p-0">
-            <div class="input-group mb-0">
-                <select 
-                    id="lang-select" 
-                    v-model="selectLang" 
-                    class="form-control small"
-                >
-                    <option 
-                        v-for="loc in locales" 
-                        :key="loc['code']" 
-                        :value="loc['code']"
-                    >{{ loc['code'] }}</option>
-                </select>
-            </div>
-        </div>
-    </div>
+    <multiselect
+        v-model="selectLang" 
+        :options="locales"
+        :value="this.$store.state.SettingsStore.settings.locale"
+        :searchable="false"
+        label="name"
+        track-by="iso"
+        class="lang-select"
+    > 
+        <template 
+            slot="singleLabel" 
+            slot-scope="props"
+        >
+            
+            <span class="option__desc"><span class="option__title">{{ props.option.iso }}</span></span>
+        </template>
+        <template 
+            slot="option" 
+            slot-scope="props"
+        >
+            
+            <span class="option__desc"><span class="option__title">{{ props.option.iso }} - {{ props.option.name }}</span></span>
+        </template>
+    </multiselect>
 </template>
 
 <script>
     import { locales } from "../config/i18n.js";
+    import Multiselect from 'vue-multiselect'
+    import i18next from 'i18next';
+    
 
 
     export default {
         name: "LangSelect",
         i18nOptions: { namespaces: "common" },
+        components: { Multiselect },
         data() {
             return {
                 locales:locales,
@@ -35,6 +46,7 @@
             selectLang: function() {
                 console.log("Switching Lang.");
                 this.$store.dispatch("SettingsStore/setLocale", { 'locale': this.selectLang });
+                i18next.changeLanguage(this.selectLang.iso);
             }
         },
         mounted() {
diff --git a/src/components/start.vue b/src/components/start.vue
index 175f25ff..59baaa84 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -1,70 +1,69 @@
 <template>
     <div class="bottom">
         <div class="content">
-            <LangSelect ref="langswitch" />
-            <p 
-                v-if="!hasWallet" 
+            <p
+                v-if="!hasWallet"
                 class="mt-3 mb-3 font-weight-normal"
             ><em>{{ $t('no_wallet') }}</em></p>
-            <router-link 
-                v-if="!hasWallet" 
-                to="/create" 
-                tag="button" 
-                class="btn btn-lg btn-primary btn-block" 
+            <router-link
+                v-if="!hasWallet"
+                to="/create"
+                tag="button"
+                class="btn btn-lg btn-primary btn-block"
                 replace
-            >{{ $t('start_cta') }}</router-link>        
-            <select 
-                v-if="hasWallet" 
-                id="wallet-select" 
-                v-model="selectedWallet" 
-                class="form-control my-3" 
+            >{{ $t('start_cta') }}</router-link>
+            <select
+                v-if="hasWallet"
+                id="wallet-select"
+                v-model="selectedWallet"
+                class="form-control my-3"
                 @change="passincorrect=''"
-            >                                
-                <option 
-                    selected 
-                    disabled 
+            >
+                <option
+                    selected
+                    disabled
                     value="0"
                 >{{ $t('select_wallet') }}</option>
-                <option 
-                    v-for="wallet in walletlist" 
-                    :key="wallet.id" 
+                <option
+                    v-for="wallet in walletlist"
+                    :key="wallet.id"
                     :value="wallet.id"
                 >{{ wallet.name }}</option>
             </select>
-            <input 
-                v-if="hasWallet" 
-                id="inputPassword" 
-                v-model="walletpass" 
-                type="password" 
-                class="form-control mb-3" 
-                :placeholder=" $t('password_placeholder')" 
-                required="" 
-                :class="passincorrect" 
+            <input
+                v-if="hasWallet"
+                id="inputPassword"
+                v-model="walletpass"
+                type="password"
+                class="form-control mb-3"
+                :placeholder=" $t('password_placeholder')"
+                required=""
+                :class="passincorrect"
                 @focus="passincorrect=''"
-            >        
-            <button 
-                v-if="hasWallet" 
-                class="btn btn-lg btn-primary btn-block" 
-                type="submit" 
+            >
+            <button
+                v-if="hasWallet"
+                class="btn btn-lg btn-primary btn-block"
+                type="submit"
                 @click="unlockWallet"
             >{{ $t('unlock_cta') }}</button>
-            <p 
-                v-if="hasWallet" 
+            <p
+                v-if="hasWallet"
                 class="my-2 font-weight-normal"
             ><em>{{ $t('or') }}</em></p>
-            <router-link 
-                v-if="hasWallet" 
-                to="/create" 
-                tag="button" 
-                class="btn btn-lg btn-primary btn-block" 
+            <router-link
+                v-if="hasWallet"
+                to="/create"
+                tag="button"
+                class="btn btn-lg btn-primary btn-block"
                 replace
-            >{{ $t('create_cta') }}</router-link>     
+            >{{ $t('create_cta') }}</router-link>
         </div>
-        <b-modal 
-            id="error" 
-            ref="errorModal" 
-            centered 
-            hide-footer 
+        <b-modal
+            id="error"
+            ref="errorModal"
+            centered
+            hide-footer
             title="Error"
         >
             {{ errorMsg }}
@@ -73,12 +72,10 @@
     </div>
 </template>
 <script>
-    import LangSelect from "./lang-select";
 
     export default {
         name: "Start",
         i18nOptions: { namespaces: "common" },
-        components: { LangSelect },
         data() {
             return {
                 walletpass: "",
diff --git a/src/config/i18n.js b/src/config/i18n.js
index 160b7678..ddad63d0 100644
--- a/src/config/i18n.js
+++ b/src/config/i18n.js
@@ -1,10 +1,12 @@
-export const defaultLocale = 'en';
-export const locales = [{
-    code: 'en',
+let localelist = [{
+    iso: 'en',
     name: 'English',
     dir: 'ltr',
 }, {
-    code: 'de',
+    iso: 'de',
     name: 'Deutsch',
     dir: 'ltr',
-}]
\ No newline at end of file
+}];
+
+export const locales=localelist;
+export const defaultLocale = localelist[0];
\ No newline at end of file
diff --git a/src/css/main.css b/src/css/main.css
index ff8b9615..7d55a0f7 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1,5 +1,4 @@
 /* Fixed Layout */
-
 html,
 body {
   height: 100%;
@@ -220,6 +219,7 @@ pre {
   0% {
     transform: rotate(0deg);
   }
+
   100% {
     transform: rotate(360deg);
   }
@@ -231,4 +231,37 @@ pre {
 
 .custom-content {
   max-height: 280px;
+}
+
+.lang-select {
+  position: absolute;
+  top: 10px;
+  right: 0;
+  width: 40px;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 0;
+  background: none;
+  color: white;
+}
+.lang-select:focus {
+  
+  position: absolute;
+  top: 10px;
+  right: 0;
+  width: 40px;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 0;
+  background: none;
+  color: white;
+  outline: 0;
+  box-shadow: none;
+}
+.lang-select option {
+  background: none;
+  color: white;
+  outline: 0;
 }
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 1a19f9ea..1307c9aa 100644
--- a/src/index.html
+++ b/src/index.html
@@ -25,24 +25,23 @@
         import router from './router/index.js';
         import i18next from 'i18next';
         import Backend from "i18next-node-fs-backend";
-
         import VueI18Next from '@panter/vue-i18next';
         
+
+        
         Vue.use(VueI18Next);
         Vue.use(BootstrapVue);
         Vue.use(VueRouter);
 
+        store.dispatch("SettingsStore/loadSettings");
         i18next.use(Backend).init({
-            lng: "en",
-            fallbackLng: "en",
+            lng: store.state.SettingsStore.settings.locale.iso,
             ns: ['common', 'operations'],
             defaultNS: 'common',
             backend: {
                 loadPath: `${__dirname}/translations/{{ns}}/{{lng}}.json`,
             }
         });
-
-        store.dispatch("SettingsStore/loadSettings");
         const i18n = new VueI18Next(i18next);
         const app = new Vue({
             router,
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index a35fae83..96d22a02 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -1,12 +1,12 @@
 import Vue from 'vue/dist/vue.js';
-import defaultLocale from '../../config/i18n.js'
+import {defaultLocale} from '../../config/i18n.js'
 const LOAD_SETTINGS = 'LOAD_SETTINGS';
 
 
 const mutations = {
     [LOAD_SETTINGS](state, settings) {
         Vue.set(state, 'settings', settings);
-    }
+    } 
 };
 
 const actions = {
@@ -20,6 +20,7 @@ const actions = {
 
                     commit(LOAD_SETTINGS, JSON.parse(settings));
                 } else {
+                    
                     localStorage.setItem("settings", JSON.stringify(initialState.settings));
                     commit(LOAD_SETTINGS, JSON.parse(initialState.settings));
                 }
@@ -74,7 +75,7 @@ const actions = {
 
 const getters = {};
 
-
+console.log(defaultLocale);
 const initialState = {
     'settings': {
         'locale': defaultLocale,
diff --git a/src/translations/common/de.json b/src/translations/common/de.json
new file mode 100644
index 00000000..5422bc6a
--- /dev/null
+++ b/src/translations/common/de.json
@@ -0,0 +1,37 @@
+{
+    "app_name": "BeetDE",
+    "slogan": "The BitShares companion",
+    "welcome": "Welcome to BeetDE!",
+    "no_wallet": "There is no wallet stored in this computer.",
+    "start_cta": "Get Started",
+    "select_wallet": "Select Wallet:",
+    "password_placeholder": "Password",
+    "unlock_cta": "Unlock",
+    "create_cta": "Create a new Wallet",
+    "step_counter": "Step {{step_no}}",
+    "friendly_cta": "Set a friendly name for your new wallet:",
+    "walletname_placeholder": "Wallet Name",
+    "cancel_btn": "Cancel",
+    "next_btn": "Next",
+    "back_btn": "Back",
+    "account_name": "{{chain}} Account Name",
+    "keys_cta": "Please enter the private keys for your account below:",
+    "active_authority": "Active Authority",
+    "owner_authority": "Owner Authority",
+    "memo_authority": "Memo Authority",
+    "active_authority_placeholder": "Active Private Key",
+    "memo_authority_placeholder": "Memo Private Key",
+    "include_owner_check": "Include Owner Key?",
+    "password_cta": "Set a password for this wallet:",
+    "confirm_cta": "Confirm password:",
+    "confirm_placeholder": "Confirm password",
+    "empty_wallet_error": "Can not create a wallet with an empty name.",
+    "duplicate_wallet_error": "A wallet with this name already exists.",
+    "missing_account_error": "You must specify your {{chain}} account name.",
+    "invalid_key_error": "Invalid Private key format.",
+    "unverified_account_error": "Could not verify keys for account name provided. Please check.",
+    "confirm_pass_error": "Passwords do not match.",
+    "balances_lbl": "Balances",
+    "error_lbl": "Error",
+    "node_lbl": "Node:"
+}
\ No newline at end of file

From c0fcb5f4902369335cb0fc3826df1670d09b9ff2 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 5 Sep 2018 09:27:08 +0300
Subject: [PATCH 10/35] Lang switcher CSS styling

---
 src/components/lang-select.vue |  4 +-
 src/css/main.css               | 73 ++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index 420e23ff..f05e40bb 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -13,14 +13,14 @@
             slot-scope="props"
         >
             
-            <span class="option__desc"><span class="option__title">{{ props.option.iso }}</span></span>
+            <span class="option__desc"><span class="option__title singleLabel">{{ props.option.iso }}</span></span>
         </template>
         <template 
             slot="option" 
             slot-scope="props"
         >
             
-            <span class="option__desc"><span class="option__title">{{ props.option.iso }} - {{ props.option.name }}</span></span>
+            <span class="option__desc"><span class="option__title options"><span class="isoCode">{{ props.option.iso }}</span> - {{ props.option.name }}</span></span>
         </template>
     </multiselect>
 </template>
diff --git a/src/css/main.css b/src/css/main.css
index 7d55a0f7..ab9ef8a4 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -236,32 +236,55 @@ pre {
 .lang-select {
   position: absolute;
   top: 10px;
-  right: 0;
-  width: 40px;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  border-radius: 0;
-  background: none;
-  color: white;
+  right: 10px;
+  left:10px;
+  text-align:right;
+}
+.lang-select.multiselect--active .singleLabel{
+  background:white;
+  color: #0a4f79;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+.lang-select .singleLabel{
+  text-transform:uppercase;
+  font-weight:bold;
+  padding:5px 10px;
+}
+.lang-select .singleLabel:hover {  
+  cursor: pointer;
+  background:white;
+  color: #0a4f79;
+  border-radius: 5px;
+ 
+}
+.lang-select .options .isoCode{
+  text-transform:uppercase;
 }
 .lang-select:focus {
-  
-  position: absolute;
-  top: 10px;
-  right: 0;
-  width: 40px;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  border-radius: 0;
-  background: none;
-  color: white;
-  outline: 0;
-  box-shadow: none;
+  outline:0;
 }
-.lang-select option {
-  background: none;
-  color: white;
-  outline: 0;
+.lang-select ul {
+  list-style:none;
+  padding:0;
+  background:white;
+  color: #0a4f79;
+  border-radius: 5px;
+  border-top-right-radius: 0px;
+  overflow:hidden;
+  max-height: 80vh;
+  font-size:14px;
+}
+
+.lang-select ul li {
+  text-align:left;
+  padding:5px 10px;
+  border-bottom: 1px solid #0a4f79;
+}
+.lang-select .multiselect__option--selected {
+  font-weight:bold;
+}
+.lang-select ul li:hover {
+  background: #77c5ec;
+  cursor: pointer;
 }
\ No newline at end of file

From 3de303b1a699da63627e889d2cb64810682040c3 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 5 Sep 2018 09:29:56 +0300
Subject: [PATCH 11/35] Removed dummy DE translation post-testing

---
 src/config/i18n.js              | 13 +++++++-----
 src/translations/common/de.json | 37 ---------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 src/translations/common/de.json

diff --git a/src/config/i18n.js b/src/config/i18n.js
index ddad63d0..ce6251f2 100644
--- a/src/config/i18n.js
+++ b/src/config/i18n.js
@@ -2,11 +2,14 @@ let localelist = [{
     iso: 'en',
     name: 'English',
     dir: 'ltr',
-}, {
-    iso: 'de',
-    name: 'Deutsch',
-    dir: 'ltr',
-}];
+}
+//,
+// {
+//    iso: 'de',
+//    name: 'Deutsch',
+//    dir: 'ltr',
+//}
+];
 
 export const locales=localelist;
 export const defaultLocale = localelist[0];
\ No newline at end of file
diff --git a/src/translations/common/de.json b/src/translations/common/de.json
deleted file mode 100644
index 5422bc6a..00000000
--- a/src/translations/common/de.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "app_name": "BeetDE",
-    "slogan": "The BitShares companion",
-    "welcome": "Welcome to BeetDE!",
-    "no_wallet": "There is no wallet stored in this computer.",
-    "start_cta": "Get Started",
-    "select_wallet": "Select Wallet:",
-    "password_placeholder": "Password",
-    "unlock_cta": "Unlock",
-    "create_cta": "Create a new Wallet",
-    "step_counter": "Step {{step_no}}",
-    "friendly_cta": "Set a friendly name for your new wallet:",
-    "walletname_placeholder": "Wallet Name",
-    "cancel_btn": "Cancel",
-    "next_btn": "Next",
-    "back_btn": "Back",
-    "account_name": "{{chain}} Account Name",
-    "keys_cta": "Please enter the private keys for your account below:",
-    "active_authority": "Active Authority",
-    "owner_authority": "Owner Authority",
-    "memo_authority": "Memo Authority",
-    "active_authority_placeholder": "Active Private Key",
-    "memo_authority_placeholder": "Memo Private Key",
-    "include_owner_check": "Include Owner Key?",
-    "password_cta": "Set a password for this wallet:",
-    "confirm_cta": "Confirm password:",
-    "confirm_placeholder": "Confirm password",
-    "empty_wallet_error": "Can not create a wallet with an empty name.",
-    "duplicate_wallet_error": "A wallet with this name already exists.",
-    "missing_account_error": "You must specify your {{chain}} account name.",
-    "invalid_key_error": "Invalid Private key format.",
-    "unverified_account_error": "Could not verify keys for account name provided. Please check.",
-    "confirm_pass_error": "Passwords do not match.",
-    "balances_lbl": "Balances",
-    "error_lbl": "Error",
-    "node_lbl": "Node:"
-}
\ No newline at end of file

From 8da32a340adfc461a4d957078b7f3507d1369d4f Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 5 Sep 2018 09:34:11 +0300
Subject: [PATCH 12/35] User must not be allowed to "deselect" lang

---
 src/components/lang-select.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index f05e40bb..e58cd511 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -4,6 +4,7 @@
         :options="locales"
         :value="this.$store.state.SettingsStore.settings.locale"
         :searchable="false"
+        :allow-empty="false"
         label="name"
         track-by="iso"
         class="lang-select"

From 2c1552fba7dd76aadf935ecd3cbcba8c335c273f Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 5 Sep 2018 12:29:16 +0300
Subject: [PATCH 13/35] Finish i18n

---
 src/components/dashboard.vue        | 40 ++++++++++++++++-------------
 src/translations/operations/en.json |  3 +++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 7c21797a..d73b8bb4 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -20,23 +20,24 @@
             no-close-on-backdrop
             hide-header-close
             hide-footer
-            title="Account Details Request"
+            :title="$t('operations:account_id.title')"
         >
-            The page/app <strong>'{{ this.$data.incoming.origin }}'</strong> is requesting to access your account ID.<br>
+            {{ $t('operations:account_id.request',{origin: this.$data.incoming.origin }) }}
             <br>
-            Do you want to allow access?
+            <br>
+            {{ $t('operations:account_id.request_cta') }}
             <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="allowAccess"
-            >Allow</b-btn>
+            >{{ $t('operations:account_id.accept_btn') }}</b-btn>
             <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="denyAccess"
-            >Deny</b-btn>
+            >{{ $t('operations:account_id.reject_btn') }}</b-btn>
         </b-modal>
         <b-modal
             id="transactionRequest"
@@ -46,10 +47,9 @@
             no-close-on-backdrop
             hide-header-close
             hide-footer
-            title="Transaction Request"
+            :title="$t('operations:rawsig.title')"
         >
-            The page/app
-            <strong>'{{ this.$data.incoming.origin }}'</strong> has submitted the following transaction.
+            {{ $t('operations:rawsig.request',{origin: this.$data.incoming.origin }) }}
             <br>
             <br>
             <pre class="text-left custom-content"><code>
@@ -58,19 +58,22 @@
   op_data: {{ this.$data.incoming.op_data }}
 }
             </code></pre>
-            Do you want to execute it?
+            
+            {{ $t('operations:rawsig.request_cta') }}
             <b-btn
                 class="mt-3"
                 variant="success"
                 block
                 @click="acceptTx"
-            >Sign &amp; Broadcast</b-btn>
+            >
+                {{ $t('operations:rawsig.accept_btn') }}</b-btn>
             <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectTx"
-            >Ignore</b-btn>
+            >
+                {{ $t('operations:rawsig.reject_btn') }}</b-btn>
         </b-modal>
         <b-modal
             id="genericRequest"
@@ -80,10 +83,9 @@
             no-close-on-backdrop
             hide-header-close
             hide-footer
-            title="Incoming Request"
+            :title="this.$data.generictitle "
         >
-            The page/app
-            <strong>'{{ this.$data.incoming.origin }}'</strong> {{ this.$data.genericmsg }}:
+            {{ this.$data.genericmsg }}:
             <br>
             <br>
             <pre class="text-left custom-content"><code>
@@ -94,13 +96,13 @@
                 variant="success"
                 block
                 @click="acceptGeneric"
-            >Approve</b-btn>
+            >{{ this.$data.genericaccept }}</b-btn>
             <b-btn
                 class="mt-1"
                 variant="danger"
                 block
                 @click="rejectGeneric"
-            >Ignore</b-btn>
+            >{{ this.$data.genericreject }}</b-btn>
         </b-modal>
         <b-modal
             id="loaderAnim"
@@ -111,7 +113,6 @@
             hide-header
             hide-header-close
             hide-footer
-            title="Loading..."
         >
             <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
         </b-modal>
@@ -237,7 +238,10 @@
                     this.$data.incoming.vote_id = objdata[0].vote_for;
                     break;
                 }
-                this.$data.genericmsg = "wants you to vote for the following " + entity;
+                this.$data.genericmsg = this.$t('operations:vote.request', {origin: this.$data.incoming.origin, entity: entity });
+                this.$data.generictitle=this.$t('operations:vote.title');
+                this.$data.genericaccept=this.$t('operations:vote.accept_btn');
+                this.$data.genericreject=this.$t('operations:vote.reject_btn');
                 this.$refs.genericReqModal.show();
                 return new Promise((res, rej) => {
                     this.$data.incoming.acceptgen = res;
diff --git a/src/translations/operations/en.json b/src/translations/operations/en.json
index e7f90f55..86ae8098 100644
--- a/src/translations/operations/en.json
+++ b/src/translations/operations/en.json
@@ -1,17 +1,20 @@
 {
     "account_id": {
+        "title": "Account Details Request",
         "request": "The page/app {{- origin}} is requesting to access your account ID.",
         "request_cta": "Do you want to allow access?",
         "accept_btn": "Allow",
         "reject_btn": "Deny"
     },
     "rawsig": {
+        "title": "Transaction Request",
         "request": "The page/app {{- origin}} has submitted the following transaction.",
         "request_cta": "Do you want to execute it?",
         "accept_btn": "Sign &amp; Broadcast",
         "reject_btn": "Ignore"
     },
     "vote": {
+        "title": "Vote Request",
         "request": "The page/app {{- origin}} wants you to vote for the following {{entity}}",
         "request_cta": "",
         "accept_btn": "Approve",

From 9a1f5ab0bff048460076cc02e951c97779d14610 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 5 Sep 2018 22:16:40 +0300
Subject: [PATCH 14/35] Added Vue Dev tools 5.0.0beta

---
 src/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/index.js b/src/index.js
index c24c4636..2678402e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,9 +5,7 @@ import {
   Tray,
   ipcMain
 } from 'electron';
-import installExtension, {
-  VUEJS_DEVTOOLS
-} from 'electron-devtools-installer';
+import installExtension from 'electron-devtools-installer';
 import {
   enableLiveReload
 } from 'electron-compile';
@@ -55,7 +53,8 @@ const createWindow = async () => {
   tray.setContextMenu(contextMenu)
   // Open the DevTools.
   if (isDevMode) {
-    await installExtension(VUEJS_DEVTOOLS);
+    //await installExtension(VUEJS_DEVTOOLS);
+    await installExtension('ljjemllljcmogpfapbkkighbhhppjdbg');
     //mainWindow.webContents.openDevTools();
   }
 

From 1a669d30039af163788bb496f9bfa05df698500f Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 6 Sep 2018 21:51:56 +0300
Subject: [PATCH 15/35] Rename BeetStore to WalletStore

---
 src/components/balances.vue                    |  2 +-
 src/components/create.vue                      |  2 +-
 src/components/dashboard.vue                   | 18 +++++++++---------
 src/components/start.vue                       |  8 ++++----
 src/store/index.js                             |  4 ++--
 .../modules/{BeetStore.js => WalletStore.js}   |  0
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename src/store/modules/{BeetStore.js => WalletStore.js} (100%)

diff --git a/src/components/balances.vue b/src/components/balances.vue
index 22014534..22f0f436 100644
--- a/src/components/balances.vue
+++ b/src/components/balances.vue
@@ -32,7 +32,7 @@
                 let result = await Apis.instance()
                     .db_api()
                     .exec("get_full_accounts", [
-                        [this.$store.state.BeetStore.wallet.accountID],
+                        [this.$store.state.WalletStore.wallet.accountID],
                         false
                     ])
                     .then(res => {
diff --git a/src/components/create.vue b/src/components/create.vue
index ef0a5012..da7b73b2 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -287,7 +287,7 @@
 
                 if (this.$data.accountID !== null) {
                     this.$store
-                        .dispatch("BeetStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
+                        .dispatch("WalletStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
                             accountName: this.$data.accountname,
                             accountID: this.$data.accountID,
                             keys: {
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index d73b8bb4..19ececbe 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -146,10 +146,10 @@
         },
         computed: {
             accountName() {
-                return this.$store.state.BeetStore.wallet.accountName;
+                return this.$store.state.WalletStore.wallet.accountName;
             },
             accountID() {
-                return this.$store.state.BeetStore.wallet.accountID;
+                return this.$store.state.WalletStore.wallet.accountID;
             }
         },
         mounted() {
@@ -163,7 +163,7 @@
                 this.$refs.loaderAnimModal.hide();
             },
             requestAccess: function(request) {
-                this.$store.dispatch("BeetStore/notifyUser", {
+                this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request"
                 });
                 this.$data.incoming = {};
@@ -175,7 +175,7 @@
                 });
             },
             requestVote: async function(request) {
-                this.$store.dispatch("BeetStore/notifyUser", {
+                this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request"
                 });
                 this.$data.incoming = {};
@@ -261,8 +261,8 @@
             allowAccess: function() {
                 this.$refs.accountReqModal.hide();
                 this.$data.incoming.accept({
-                    account: this.$store.state.BeetStore.wallet.accountName,
-                    id: this.$store.state.BeetStore.wallet.accountID
+                    account: this.$store.state.WalletStore.wallet.accountName,
+                    id: this.$store.state.WalletStore.wallet.accountID
                 });
             },
             denyAccess: function() {
@@ -279,7 +279,7 @@
                     tr.set_required_fees().then(async () => {
                         this.$refs.loaderAnimModal.show();
                         let pKey = PrivateKey.fromWif(
-                            this.$store.state.BeetStore.wallet.keys.active
+                            this.$store.state.WalletStore.wallet.keys.active
                         );
                         tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
                         let id = await tr.broadcast();
@@ -297,14 +297,14 @@
                 let tr = new TransactionBuilder();
                 let operation = await Operations.generate(
                     this.$data.incoming,
-                    this.$store.state.BeetStore.wallet.accountID
+                    this.$store.state.WalletStore.wallet.accountID
                 );
 
                 tr.add_type_operation(operation.op_type, operation.op_data);
                 tr.set_required_fees().then(async () => {
                     this.$refs.loaderAnimModal.show();
                     let pKey = PrivateKey.fromWif(
-                        this.$store.state.BeetStore.wallet.keys.active
+                        this.$store.state.WalletStore.wallet.keys.active
                     );
                     tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
                     let id = await tr.broadcast();
diff --git a/src/components/start.vue b/src/components/start.vue
index 59baaa84..226d1052 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -86,19 +86,19 @@
         },
         computed: {
             hasWallet() {
-                return this.$store.state.BeetStore.hasWallet;
+                return this.$store.state.WalletStore.hasWallet;
             },
             walletlist() {
-                return this.$store.state.BeetStore.walletlist;
+                return this.$store.state.WalletStore.walletlist;
             }
         },
         mounted() {
-            this.$store.dispatch("BeetStore/loadWallets", {});
+            this.$store.dispatch("WalletStore/loadWallets", {});
         },
         methods: {
             unlockWallet() {
                 this.$store
-                    .dispatch("BeetStore/getWallet", {
+                    .dispatch("WalletStore/getWallet", {
                         wallet_id: this.$data.selectedWallet,
                         wallet_pass: this.$data.walletpass
                     })
diff --git a/src/store/index.js b/src/store/index.js
index a0e64b54..ddc7714d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,13 +1,13 @@
 import Vue from 'vue/dist/vue.js';
 import Vuex from 'vuex';
-import BeetStore from './modules/BeetStore.js';
+import WalletStore from './modules/WalletStore.js';
 import SettingsStore from './modules/SettingsStore.js';
 
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
     modules: {
-        BeetStore,
+        WalletStore,
         SettingsStore
     }
   });
diff --git a/src/store/modules/BeetStore.js b/src/store/modules/WalletStore.js
similarity index 100%
rename from src/store/modules/BeetStore.js
rename to src/store/modules/WalletStore.js

From 54d6282dd4623781ce99d32396dde68e89439b70 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Fri, 7 Sep 2018 17:33:42 +0300
Subject: [PATCH 16/35] Initial Work

---
 package-lock.json                |  5 +++
 package.json                     |  1 +
 src/components/dashboard.vue     |  5 +--
 src/components/popups.vue        | 33 ++++++++++++++
 src/index.html                   |  9 +++-
 src/lib/Authorisation.js         |  0
 src/lib/BeetAPI.js               | 13 +++++-
 src/lib/BeetDB.js                |  9 ++++
 src/lib/BeetServer.js            |  9 +++-
 src/store/index.js               |  4 +-
 src/store/modules/OriginStore.js | 77 ++++++++++++++++++++++++++++++++
 src/store/modules/WalletStore.js | 28 ++++++++++--
 12 files changed, 181 insertions(+), 12 deletions(-)
 create mode 100644 src/components/popups.vue
 create mode 100644 src/lib/Authorisation.js
 create mode 100644 src/lib/BeetDB.js
 create mode 100644 src/store/modules/OriginStore.js

diff --git a/package-lock.json b/package-lock.json
index 719a4469..80180773 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2682,6 +2682,11 @@
       "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
       "dev": true
     },
+    "dexie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/dexie/-/dexie-2.0.4.tgz",
+      "integrity": "sha512-aQ/s1U2wHxwBKRrt2Z/mwFNHMQWhESerFsMYzE+5P5OsIe5o1kgpFMWkzKTtkvkyyEni6mWr/T4HUJuY9xIHLA=="
+    },
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
diff --git a/package.json b/package.json
index c4d15844..c851a1cf 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@panter/vue-i18next": "^0.12.0",
     "bitsharesjs": "^1.8.0",
     "bootstrap-vue": "^2.0.0-rc.11",
+    "dexie": "^2.0.4",
     "electron-compile": "^6.4.3",
     "electron-devtools-installer": "^2.2.4",
     "electron-squirrel-startup": "^1.0.0",
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 19ececbe..44e81336 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -121,7 +121,6 @@
 </template>
 
 <script>
-    import BeetServer from "../lib/BeetServer";
     import Operations from "../lib/Operations";
     import NodeSelect from "./node-select";
     import Balances from "./balances";
@@ -154,15 +153,15 @@
         },
         mounted() {
             this.$refs.loaderAnimModal.show();
-            BeetServer.initialize(this);
-            BeetServer.open();
         },
         methods: {
             getBalances: async function() {
                 await this.$refs.balancetable.getBalances();
+                this.$store.dispatch("WalletStore/confirmUnlock");
                 this.$refs.loaderAnimModal.hide();
             },
             requestAccess: function(request) {
+                
                 this.$store.dispatch("WalletStore/notifyUser", {
                     notify: "request"
                 });
diff --git a/src/components/popups.vue b/src/components/popups.vue
new file mode 100644
index 00000000..813578f5
--- /dev/null
+++ b/src/components/popups.vue
@@ -0,0 +1,33 @@
+<template>
+    <b-modal
+        id="linkRequest"
+        ref="linkReqModal"
+        centered
+        no-close-on-esc
+        no-close-on-backdrop
+        hide-header-close
+        hide-footer
+        :title="$t('link_request')"
+    >
+        {{ this.$data.genericmsg }}:
+        <br>
+        <br>        
+    </b-modal>
+</template>
+
+<script>
+    export default {
+        name: "Popups",
+        i18nOptions: { namespaces: "common" },        
+        data() {
+            return {
+                genericmsg: ''
+            };
+        },        
+        methods: {
+            link: async function() {
+                await this.$refs.linkReqModal.show();
+            }
+        }
+    };
+</script>
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 1307c9aa..417a78d9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -16,24 +16,28 @@
     <div class="main" id="app">
         <router-view name="header"></router-view>
         <router-view></router-view>
+        <Popups></Popups>
     </div>
     <script>
         import Vue from 'vue/dist/vue.js';
         import BootstrapVue from 'bootstrap-vue';
+        import Popups from './components/popups';
         import VueRouter from 'vue-router';
         import store from './store/index.js';
         import router from './router/index.js';
         import i18next from 'i18next';
         import Backend from "i18next-node-fs-backend";
         import VueI18Next from '@panter/vue-i18next';
+        import BeetServer from "./lib/BeetServer";
         
 
         
         Vue.use(VueI18Next);
         Vue.use(BootstrapVue);
         Vue.use(VueRouter);
-
+        Vue.component('Popups',Popups);
         store.dispatch("SettingsStore/loadSettings");
+        store.dispatch("OriginStore/loadApps");
         i18next.use(Backend).init({
             lng: store.state.SettingsStore.settings.locale.iso,
             ns: ['common', 'operations'],
@@ -48,6 +52,9 @@
             store,
             i18n: i18n
         }).$mount('#app');
+        
+        BeetServer.initialize(app);
+        BeetServer.open();
     </script>
 </body>
 
diff --git a/src/lib/Authorisation.js b/src/lib/Authorisation.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index d1db1fb1..ec417a5d 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -1,5 +1,6 @@
 import * as Actions from './Actions';
 import Queue from './Queue';
+import store from '../store/index.js';
 
 var popupQ = new Queue();
 export default class BeetAPI {
@@ -16,7 +17,9 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            result = await this[request.type](request, vueInst);
+            console.log('waiting');
+            let unlocked=await store.state.WalletStore.unlocked.promise;
+            result = await this[request.type](request, vueInst.$children[1]);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         } else {
@@ -38,8 +41,11 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
+            console.log('waiting2');
             await previous.promise;
-            result = await this[request.type](request, vueInst);
+            
+            console.log('waiting done');
+            result = await this[request.type](request, vueInst.$children[1]);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         }
@@ -48,12 +54,15 @@ export default class BeetAPI {
 
     static async [Actions.GET_ACCOUNT](request, vue) {
         try {
+            
+            console.log(vue);
             let response = await vue.requestAccess(request.payload);
             return {
                 id: request.id,
                 result: response
             };
         } catch (e) {
+            console.log(e);
             return e;
         }
     }
diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
new file mode 100644
index 00000000..ee116e5c
--- /dev/null
+++ b/src/lib/BeetDB.js
@@ -0,0 +1,9 @@
+import Dexie from 'dexie';
+const BeetDB = new Dexie('BeetDB');
+
+BeetDB.version(1).stores({
+    apps: `++id,name, wallet, domain, origin, pkey, nonce`,
+    settings: `++id,setting, value`
+}); 
+
+export default BeetDB;
\ No newline at end of file
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 150ceda3..6d03bef7 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -1,5 +1,7 @@
 import BeetAPI from './BeetAPI';
 
+const version= {release: 1, name:'1.0.0beta'};
+
 let io = null;
 let vueInst = null;
 const socketHandler = (socket) => {
@@ -16,7 +18,7 @@ const socketHandler = (socket) => {
 
     // When something connects we automatically
     // notify it of a successful connection
-    socket.emit('connected');
+    socket.emit('connected',version);
     //let authorized=await vueInst.authorize(req);
     //if (authorized) {
     // All authenticated api requests pass through the 'api' route.
@@ -25,7 +27,10 @@ const socketHandler = (socket) => {
             plugin: req.plugin
         }), vueInst));
     });
-
+    socket.on('link',asynq req=> {
+        //TODO
+        //socket.emit('link',await vueInst.)
+    })
     socket.on('disconnect', () => {
 
     });
diff --git a/src/store/index.js b/src/store/index.js
index ddc7714d..5b1f0658 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,7 @@
 import Vue from 'vue/dist/vue.js';
 import Vuex from 'vuex';
 import WalletStore from './modules/WalletStore.js';
+import OriginStore from './modules/OriginStore.js';
 import SettingsStore from './modules/SettingsStore.js';
 
 Vue.use(Vuex);
@@ -8,7 +9,8 @@ Vue.use(Vuex);
 const store = new Vuex.Store({
     modules: {
         WalletStore,
-        SettingsStore
+        SettingsStore,
+        OriginStore
     }
   });
 
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
new file mode 100644
index 00000000..80278cfc
--- /dev/null
+++ b/src/store/modules/OriginStore.js
@@ -0,0 +1,77 @@
+import Vue from 'vue/dist/vue.js';
+import BeetDB from '../../lib/BeetDB.js';
+const LOAD_APPS = 'LOAD_APPS';
+const ADD_APP = 'ADD_APP';
+const INC_NONCE = 'INC_NONCE';
+
+const mutations = {
+    [LOAD_APPS](state, apps) {
+        Vue.set(state, 'apps', apps);
+    },
+    [ADD_APP](state, app) {
+        state.apps.push(app);
+    },
+    [INC_NONCE](state, app_id) {
+        state.app.find(o => o.id === app_id).nonce++;
+    }
+};
+
+const actions = {
+    loadApps({
+        commit
+    }) {
+        return new Promise((resolve, reject) => {
+            BeetDB.apps.toArray().then((apps) => {
+                commit(LOAD_APPS, apps);
+                resolve();
+            }).catch(() => {
+                reject();
+            });
+        });
+    },
+    addApp({
+        commit
+    }, payload) {
+        return new Promise((resolve, reject) => {
+            BeetDB.apps.add(payload).then((id) => {
+                payload.id = id;
+                commit(ADD_APP, payload);
+                resolve();
+            }).catch(() => {
+                reject();
+            });
+        });
+    },
+    incNonce({
+        commit
+    }, payload) {
+
+        return new Promise((resolve, reject) => {
+            BeetDB.apps.update(payload, function (appobj) {
+                appobj.nonce++;
+                return appobj;
+            }).then((id) => {
+                payload.id = id;
+                commit(INC_NONCE, payload);
+                resolve();
+            }).catch(() => {
+                reject();
+            });
+        });
+    }
+}
+
+
+const getters = {};
+
+const initialState = {
+    'apps': []
+};
+
+export default {
+    namespaced: true,
+    state: initialState,
+    actions,
+    mutations,
+    getters,
+};
\ No newline at end of file
diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index 24a652b4..27f1960e 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -8,7 +8,9 @@ import {
 } from "uuid";
 const GET_WALLET = 'GET_WALLET';
 const CREATE_WALLET = 'CREATE_WALLET';
+const CONFIRM_UNLOCK = 'CONFIRM_UNLOCK';
 const SET_WALLET_STATUS = 'SET_WALLET_STATUS';
+const SET_WALLET_UNLOCKED = 'SET_WALLET_UNLOCKED';
 const SET_WALLETLIST = 'SET_WALLETLIST';
 const REQ_NOTIFY = 'REQ_NOTIFY';
 
@@ -17,14 +19,22 @@ const wallet = {};
 
 const mutations = {
     [GET_WALLET](state, wallet) {
+        
+       
         Vue.set(state, 'wallet', wallet);
     },
-
+    [CONFIRM_UNLOCK](state) {
+        state.unlocked.resolve();
+    },
     [SET_WALLET_STATUS](state, status) {
 
         Vue.set(state, 'hasWallet', status);
     },
 
+    [SET_WALLET_UNLOCKED](state, unlocked) {
+
+        Vue.set(state, 'unlocked', unlocked);
+    },
     [SET_WALLETLIST](state, walletlist) {
 
         Vue.set(state, 'walletlist', walletlist);
@@ -52,10 +62,14 @@ const actions = {
                 commit(GET_WALLET, wallet);
                 resolve();
             } catch (e) {
+                console.log(e);
                 reject();
             }
         });
     },
+    confirmUnlock({commit}) {
+        commit(CONFIRM_UNLOCK);
+    },
     saveWallet({
         commit
     }, payload) {
@@ -97,6 +111,14 @@ const actions = {
             try {
                 let wallets = JSON.parse(localStorage.getItem("wallets"));
                 if (wallets && wallets.length > 0) {
+                    let unlock;
+                    let unlocked = new Promise(function (resolve) {
+                        unlock = resolve
+                    });
+                    commit(SET_WALLET_UNLOCKED, {
+                        promise: unlocked,
+                        resolve: unlock
+                    });
                     commit(SET_WALLET_STATUS, true);
                     commit(SET_WALLETLIST, wallets);
                     resolve('Wallets Found');
@@ -129,12 +151,12 @@ const getters = {
     getWalletList: state => state.walletlist
 };
 
-
 const initialState = {
     wallet: wallet,
     hasWallet: false,
     walletlist: [],
-    ipc: ipcRenderer
+    ipc: ipcRenderer,
+    unlocked: {}
 };
 
 export default {

From 4214e3fe35b8bc00d0cb7faff6f29b38aef9af88 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 20 Sep 2018 08:17:31 +0300
Subject: [PATCH 17/35] WIP

---
 package-lock.json     |   5 ++
 package.json          |   2 +
 src/config/config.js  |   1 +
 src/lib/BeetServer.js |   6 +-
 src/lib/BeetWS.js     | 146 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 157 insertions(+), 3 deletions(-)
 create mode 100644 src/lib/BeetWS.js

diff --git a/package-lock.json b/package-lock.json
index 80180773..d01bb7e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7326,6 +7326,11 @@
         "os-tmpdir": "^1.0.0"
       }
     },
+    "otpauth": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/otpauth/-/otpauth-3.2.1.tgz",
+      "integrity": "sha512-GQu6C3Zs3lZG++JkmsOOnit3AGpi+PuFdm8fN+6jNBWbUtMZWtrY8cdoT2Q47XC5fg/A8L5Jo646UrUWALNtwg=="
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
diff --git a/package.json b/package.json
index c851a1cf..506bd653 100644
--- a/package.json
+++ b/package.json
@@ -50,12 +50,14 @@
     "@panter/vue-i18next": "^0.12.0",
     "bitsharesjs": "^1.8.0",
     "bootstrap-vue": "^2.0.0-rc.11",
+    "crypto-js": "^3.1.9-1",
     "dexie": "^2.0.4",
     "electron-compile": "^6.4.3",
     "electron-devtools-installer": "^2.2.4",
     "electron-squirrel-startup": "^1.0.0",
     "i18next": "^11.6.0",
     "i18next-node-fs-backend": "^2.0.0",
+    "otpauth": "^3.2.1",
     "secure-ls": "^1.2.1",
     "socket.io": "^2.1.1",
     "uuid": "^3.3.2",
diff --git a/src/config/config.js b/src/config/config.js
index 66f7071e..6057558a 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,3 +1,4 @@
+export const version ={release: 1, name:'1.0.0beta'};
 export const nodeList = [
 
     {
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 6d03bef7..656bd6d3 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -1,5 +1,5 @@
 import BeetAPI from './BeetAPI';
-
+import BeetWS from './BeetWS';
 const version= {release: 1, name:'1.0.0beta'};
 
 let io = null;
@@ -27,7 +27,7 @@ const socketHandler = (socket) => {
             plugin: req.plugin
         }), vueInst));
     });
-    socket.on('link',asynq req=> {
+    socket.on('link',async req=> {
         //TODO
         //socket.emit('link',await vueInst.)
     })
@@ -38,7 +38,7 @@ const socketHandler = (socket) => {
     //        socket.disconnect();
     //    }
 };
-
+const server=new BeetWS(60556,10000);
 export default class BeetServer {
 
     static initialize(vue) {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
new file mode 100644
index 00000000..b921ba69
--- /dev/null
+++ b/src/lib/BeetWS.js
@@ -0,0 +1,146 @@
+import EventEmitter from 'events';
+import {version} from '../config/config';
+import WebSocket from 'ws';
+import {
+  v4 as uuidv4
+} from 'uuid'
+import OTPAuth from 'otpauth';
+import CryptoJS from "crypto-js";
+
+export default class BeetWS extends EventEmitter {
+  constructor(port, timeout) {
+    super() // required
+    var self = this;
+    const server = new WebSocket.Server({
+      port: port
+    });
+    this._clients = [];
+    this._monitor = setInterval(function () {
+      for (var clientid in self._clients) {
+        let client = self._clients[clientid];
+        if (client.isAlive === false) {
+          self.emit('disconnected', client.id);
+          delete(self._clients[client.id]);
+          return client.terminate();
+        } else {
+          client.isAlive = false;
+          client.ping(self.noop);
+        }
+      }
+    }, timeout);
+    console.log(self);
+    server.on('connection', (client) => {
+      self._handleConnection(client);
+    });
+  }
+  noop() {
+
+  }
+  _heartbeat() {
+    this.isAlive = true;
+  }
+  _handleMessage(client, data) {
+    if (client.isAuthenticated) {
+      if (client.isLinked) {
+        if (data.type == 'api') {
+          var key = client.otp.generate();
+          if (key == data.nonce) {
+            try {
+              var msg = CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8);
+              this.emit('api', {
+                "client": client.id,
+                "id": data.id,
+                "payload": msg
+              });
+            } catch (e) {
+              client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Could not decrypt message'}");
+            }
+          } else {
+            client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Unexpected nonce. Please relink.'}");
+          }
+        } else {
+          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Beet could not understand your request'}");
+        }
+      } else {
+        if (data.type == 'link') {
+          this.emit('link', {
+            "client": client.id,
+            "data": data
+          });
+        } else {
+          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'This app is not yet linked'}");
+        }
+      }
+    } else {
+      if (data.type == 'authenticate') {
+        this.emit('authenticate', {
+          "client": client.id,
+          "data": data
+        });
+      } else {
+        if (data.type=='version') {
+          console.log(version);
+          client.send('{ "type": "version", "result": '+JSON.stringify(version)+"}");
+        }else{
+          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Must authenticate first'}");
+        }
+      }
+    }
+  }
+  respondLink(client, data) {
+    if (data.response.isLinked == true) {
+      let otp = new OTPAuth.HOTP({
+        issuer: 'Beet',
+        label: 'BeetAuth',
+        algorithm: 'SHA1',
+        digits: 32,
+        counter: data.response.counter,
+        secret: OTPAuth.Secret.fromB32(data.response.sharedKey)
+      });
+      this._clients[client].otp = otp;
+      this._clients[client].isLinked = true;
+      this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': " + JSON.stringify(data.response) + "}");
+    } else {
+      this._clients[client].send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Could not link to Beet'}");
+    }
+  }
+  respondAPI(client, data) {
+
+    var key = this._clients[client].otp.generate();
+    var payload = CryptoJS.AES.encrypt(JSON.stringify(data.response), key).toString();
+    this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': '" + payload + "', 'nonce': '" + key + "'}");
+  }
+  authGranted(client, data) {
+    this._clients[client].isAuthenticated = true;
+    if (data.response.isLinked == true) {
+      let otp = new OTPAuth.HOTP({
+        issuer: 'Beet',
+        label: 'BeetAuth',
+        algorithm: 'SHA1',
+        digits: 32,
+        counter: data.response.counter,
+        secret: OTPAuth.Secret.fromB32(data.response.sharedKey)
+      });
+      this._clients[client].otp = otp;
+      this._clients[client].isLinked = true;
+    }
+    this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': " + JSON.stringify(data.response) + "}");
+  }
+  authRejected(client, data) {
+    this._clients[client].send("{'id': " + data.id + ", 'result': 'error' , 'data': " + JSON.stringify(data.response) + "}");
+  }
+  _handleConnection(client) {
+    client.id = uuidv4();
+    client.isAlive = true;
+    client.isAuthenticated = false;
+    let self = this;
+    client.on('pong', this._heartbeat);
+    this._clients[client.id] = client;
+    this.emit('connected', client.id);
+    console.log(this);
+    client.on('message', function (msg) {
+      let message = JSON.parse(msg);
+      self._handleMessage(client, message);
+    });
+  }
+}
\ No newline at end of file

From 4ad3cc2e73a99408435121a060683a55a8fab09a Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 20 Sep 2018 18:13:47 +0300
Subject: [PATCH 18/35] WIP

---
 src/lib/Actions.js    |   1 +
 src/lib/BeetAPI.js    |  23 +++++++--
 src/lib/BeetServer.js |  32 ++++++++++--
 src/lib/BeetWS.js     | 113 ++++++++++++++++++++++++------------------
 4 files changed, 116 insertions(+), 53 deletions(-)

diff --git a/src/lib/Actions.js b/src/lib/Actions.js
index 3a9678ec..a1936619 100644
--- a/src/lib/Actions.js
+++ b/src/lib/Actions.js
@@ -1,3 +1,4 @@
 export const GET_ACCOUNT = 'getAccount';
 export const REQUEST_SIGNATURE = 'requestSignature';
+export const REQUEST_LINK = 'link';
 export const VOTE_FOR = 'voteFor';
\ No newline at end of file
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index ec417a5d..5ef32265 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -19,7 +19,7 @@ export default class BeetAPI {
             });
             console.log('waiting');
             let unlocked=await store.state.WalletStore.unlocked.promise;
-            result = await this[request.type](request, vueInst.$children[1]);
+            result = await this[request.type](request, vueInst.$children[2]);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         } else {
@@ -45,7 +45,7 @@ export default class BeetAPI {
             await previous.promise;
             
             console.log('waiting done');
-            result = await this[request.type](request, vueInst.$children[1]);
+            result = await this[request.type](request, vueInst.$children[2]);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         }
@@ -66,7 +66,24 @@ export default class BeetAPI {
             return e;
         }
     }
-
+    static async [Actions.REQUEST_LINK](request, vue) {
+        try {
+            
+            console.log(vue);
+            let response = await vue.requestAccess(request);
+            console.log({
+                id: request.id,
+                result: response
+            });
+            return {
+                id: request.id,
+                response: { isLinked: true, counter: 0 , sharedKey: 'ddfe', identity:  response }
+            };
+        } catch (e) {
+            console.log(e);
+            return { id: request.id, response: { isLinked: false }};
+        }
+    }
     static async [Actions.VOTE_FOR](request, vue) {
         try {
             let response = await vue.requestVote(request.payload);
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 656bd6d3..a6443815 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -1,6 +1,6 @@
 import BeetAPI from './BeetAPI';
 import BeetWS from './BeetWS';
-const version= {release: 1, name:'1.0.0beta'};
+import CryptoJS from 'crypto-js';
 
 let io = null;
 let vueInst = null;
@@ -18,7 +18,7 @@ const socketHandler = (socket) => {
 
     // When something connects we automatically
     // notify it of a successful connection
-    socket.emit('connected',version);
+    //socket.emit('connected',version);
     //let authorized=await vueInst.authorize(req);
     //if (authorized) {
     // All authenticated api requests pass through the 'api' route.
@@ -38,15 +38,41 @@ const socketHandler = (socket) => {
     //        socket.disconnect();
     //    }
 };
-const server=new BeetWS(60556,10000);
+
+const linkHandler = async (req) => {
+   return await BeetAPI.handler(Object.assign(req.data, {}), vueInst);
+};
+
+const authHandler = async (req) => {
+    console.log(req)
+
+    let key=CryptoJS.SHA256(req.data.appid+' '+req.data.account_id).toString()
+    return  {isLinked: true, counter: 1 , sharedKey: key};
+ };
+
 export default class BeetServer {
 
     static initialize(vue) {
         vueInst = vue;
         const server = window.require('http').createServer();
         server.listen(60555, 'localhost');
+        const server2=new BeetWS(60556,10000);
         io = window.require('socket.io').listen(server);
         console.log('Beet listening...');
+        server2.on('link',async (data)=> {
+            let status=await linkHandler(data);
+            console.log(status);
+            server2.respondLink(data.client, status);
+        });
+        server2.on('authenticate',async (data)=> {
+            let status=await authHandler(data);
+            console.log(status);
+            let result={};
+            result.original=data.data.data;
+            result.response=status;
+            result.id=data.id;
+            server2.respondAuth(data.client, result);
+        });
     }
 
     static open() {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index b921ba69..ca2dcb76 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -1,11 +1,13 @@
-import EventEmitter from 'events';
-import {version} from '../config/config';
-import WebSocket from 'ws';
+import EventEmitter from "events";
+import {
+  version
+} from "../config/config";
+import WebSocket from "ws";
 import {
   v4 as uuidv4
-} from 'uuid'
-import OTPAuth from 'otpauth';
-import CryptoJS from "crypto-js";
+} from "uuid"
+const OTPAuth=require("otpauth");
+import CryptoJS from 'crypto-js';
 
 export default class BeetWS extends EventEmitter {
   constructor(port, timeout) {
@@ -17,10 +19,13 @@ export default class BeetWS extends EventEmitter {
     this._clients = [];
     this._monitor = setInterval(function () {
       for (var clientid in self._clients) {
+        
         let client = self._clients[clientid];
-        if (client.isAlive === false) {
-          self.emit('disconnected', client.id);
+        console.log(client);
+        if (client.isAlive === false || client.readyState!=1) {
+          self.emit("disconnected", client.id);
           delete(self._clients[client.id]);
+          console.log("Terminating client")
           return client.terminate();
         } else {
           client.isAlive = false;
@@ -29,7 +34,7 @@ export default class BeetWS extends EventEmitter {
       }
     }, timeout);
     console.log(self);
-    server.on('connection', (client) => {
+    server.on("connection", (client) => {
       self._handleConnection(client);
     });
   }
@@ -42,47 +47,56 @@ export default class BeetWS extends EventEmitter {
   _handleMessage(client, data) {
     if (client.isAuthenticated) {
       if (client.isLinked) {
-        if (data.type == 'api') {
+        if (data.type == "api") {
           var key = client.otp.generate();
           if (key == data.nonce) {
             try {
               var msg = CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8);
-              this.emit('api', {
-                "client": client.id,
-                "id": data.id,
-                "payload": msg
+              this.emit("api", {
+                'client': client.id,
+                'id': data.id,
+                'payload': msg
               });
             } catch (e) {
-              client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Could not decrypt message'}");
+              client.send('{"id": ' + data.id + ', "result": "error" , "data": "Could not decrypt message"}');
             }
           } else {
-            client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Unexpected nonce. Please relink.'}");
+            client.send('{"id": ' + data.id + ', "result": "error" , "data": "Unexpected nonce. Please relink."}');
           }
         } else {
-          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Beet could not understand your request'}");
+          client.send('{"id": ' + data.id + ', "result": "error" , "data": "Beet could not understand your request"}');
         }
       } else {
-        if (data.type == 'link') {
-          this.emit('link', {
-            "client": client.id,
-            "data": data
+        if (data.type == "link") {
+          this.emit("link", {
+            'client': client.id,
+            'data': data
           });
         } else {
-          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'This app is not yet linked'}");
+          client.send('{"id": ' + data.id + ', "result": "error" , "data": "This app is not yet linked"}');
         }
       }
     } else {
-      if (data.type == 'authenticate') {
-        this.emit('authenticate', {
-          "client": client.id,
-          "data": data
+      if (data.type == "authenticate") {
+        this.emit("authenticate", {
+          'client': client.id,
+          'data': data
         });
       } else {
-        if (data.type=='version') {
+        if (data.type == "version") {
           console.log(version);
-          client.send('{ "type": "version", "result": '+JSON.stringify(version)+"}");
-        }else{
-          client.send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Must authenticate first'}");
+          client.send("{ 'type': 'version', 'result': " + JSON.stringify(version) + '}');
+        } else {
+          
+          if (data.type == "link") {
+            this.emit("link", {
+              'client': client.id,
+              'data': data
+            });
+            console.log('Try link');
+          } else{
+            client.send('{"id": ' + data.id + ', "result": "error" , "data": "Must authenticate or link first"}');
+          }
         }
       }
     }
@@ -90,55 +104,60 @@ export default class BeetWS extends EventEmitter {
   respondLink(client, data) {
     if (data.response.isLinked == true) {
       let otp = new OTPAuth.HOTP({
-        issuer: 'Beet',
-        label: 'BeetAuth',
-        algorithm: 'SHA1',
+        issuer: "Beet",
+        label: "BeetAuth",
+        algorithm: "SHA1",
         digits: 32,
         counter: data.response.counter,
         secret: OTPAuth.Secret.fromB32(data.response.sharedKey)
       });
       this._clients[client].otp = otp;
       this._clients[client].isLinked = true;
-      this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': " + JSON.stringify(data.response) + "}");
+      this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": ' + JSON.stringify(data.response.identity) + '}');
     } else {
-      this._clients[client].send("{'id': " + data.id + ", 'result': 'error' , 'data': 'Could not link to Beet'}");
+      this._clients[client].send('{"id": ' + data.id + ', "result": "error" , "data": "Could not link to Beet"}');
     }
   }
   respondAPI(client, data) {
 
     var key = this._clients[client].otp.generate();
     var payload = CryptoJS.AES.encrypt(JSON.stringify(data.response), key).toString();
-    this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': '" + payload + "', 'nonce': '" + key + "'}");
+    this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": "' + payload + '", "nonce": "' + key + '"}');
   }
-  authGranted(client, data) {
-    this._clients[client].isAuthenticated = true;
+  respondAuth(client, data) {
+    //this._clients[client].isAuthenticated = true;
     if (data.response.isLinked == true) {
       let otp = new OTPAuth.HOTP({
-        issuer: 'Beet',
-        label: 'BeetAuth',
-        algorithm: 'SHA1',
+        issuer: "Beet",
+        label: "BeetAuth",
+        algorithm: "SHA1",
         digits: 32,
         counter: data.response.counter,
-        secret: OTPAuth.Secret.fromB32(data.response.sharedKey)
+        secret: OTPAuth.Secret.fromHex(data.response.sharedKey)
       });
       this._clients[client].otp = otp;
+      let key=this._clients[client].otp.generate();
+      console.log(key);
+      console.log(data.original);
+      var msg = CryptoJS.AES.decrypt(data.original, key).toString(CryptoJS.enc.Utf8);
+      console.log(msg);
       this._clients[client].isLinked = true;
     }
-    this._clients[client].send("{'id': " + data.id + ", 'result': 'success' , 'data': " + JSON.stringify(data.response) + "}");
+    this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": ' + JSON.stringify(data.response) + '}');
   }
   authRejected(client, data) {
-    this._clients[client].send("{'id': " + data.id + ", 'result': 'error' , 'data': " + JSON.stringify(data.response) + "}");
+    this._clients[client].send('{"id": ' + data.id + ', "result": "error" , "data": ' + JSON.stringify(data.response) + '}');
   }
   _handleConnection(client) {
     client.id = uuidv4();
     client.isAlive = true;
     client.isAuthenticated = false;
     let self = this;
-    client.on('pong', this._heartbeat);
+    client.on("pong", this._heartbeat);
     this._clients[client.id] = client;
-    this.emit('connected', client.id);
+    this.emit("connected", client.id);
     console.log(this);
-    client.on('message', function (msg) {
+    client.on("message", function (msg) {
       let message = JSON.parse(msg);
       self._handleMessage(client, message);
     });

From 9bd944712ebc519b05fdcfcb8f3de6a0867a634e Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Fri, 21 Sep 2018 06:43:31 +0300
Subject: [PATCH 19/35] Linker fix

---
 src/lib/BeetDB.js     |  2 +-
 src/lib/BeetServer.js | 16 +++++++++++++---
 src/lib/BeetWS.js     |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index ee116e5c..bb2b3dab 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -2,7 +2,7 @@ import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
 
 BeetDB.version(1).stores({
-    apps: `++id,name, wallet, domain, origin, pkey, nonce`,
+    apps: `++id,appname, origin, apphash, account_id, nonce`,
     settings: `++id,setting, value`
 }); 
 
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index a6443815..678c9921 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -1,6 +1,7 @@
 import BeetAPI from './BeetAPI';
 import BeetWS from './BeetWS';
 import CryptoJS from 'crypto-js';
+import store from './store/index.js';
 
 let io = null;
 let vueInst = null;
@@ -40,13 +41,22 @@ const socketHandler = (socket) => {
 };
 
 const linkHandler = async (req) => {
-   return await BeetAPI.handler(Object.assign(req.data, {}), vueInst);
+    let userResponse;
+    try {
+       userResponse = await BeetAPI.handler(Object.assign(req.data, {}), vueInst);
+       store.dispatch('OriginStore/addApp', {appname:req.data.appname , apphash: req.data.appid , origin: req.data.origin, account_id: userResponse.id, nonce: 0});
+       let key=CryptoJS.SHA256(req.data.appid+' '+userResponse.id).toString();
+
+       return  { isLinked: true, counter: 0 , sharedKey: key, identity: userResponse };
+    }catch(e) {
+        
+    }
 };
 
 const authHandler = async (req) => {
-    console.log(req)
-
+   
     let key=CryptoJS.SHA256(req.data.appid+' '+req.data.account_id).toString()
+    
     return  {isLinked: true, counter: 1 , sharedKey: key};
  };
 
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index ca2dcb76..dfa6f789 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -109,7 +109,7 @@ export default class BeetWS extends EventEmitter {
         algorithm: "SHA1",
         digits: 32,
         counter: data.response.counter,
-        secret: OTPAuth.Secret.fromB32(data.response.sharedKey)
+        secret: OTPAuth.Secret.fromHex(data.response.sharedKey)
       });
       this._clients[client].otp = otp;
       this._clients[client].isLinked = true;

From fa138de9990227aad0e8bdf7d074f3254a7f10c7 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Mon, 1 Oct 2018 08:52:19 +0300
Subject: [PATCH 20/35] WIP

---
 package-lock.json     |  97 ++++++++++++++++++++++++++--
 package.json          |   1 +
 src/lib/BeetServer.js |  18 +++---
 src/lib/BeetWS.js     | 146 ++++++++++++++++++++++--------------------
 4 files changed, 181 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d01bb7e8..1da81fcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1496,6 +1496,12 @@
         "chainsaw": "~0.1.0"
       }
     },
+    "bindings": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+      "optional": true
+    },
     "bitsharesjs": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/bitsharesjs/-/bitsharesjs-1.8.0.tgz",
@@ -1582,8 +1588,12 @@
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-      "dev": true
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
     },
     "boolbase": {
       "version": "1.0.0",
@@ -1637,6 +1647,11 @@
         "concat-map": "0.0.1"
       }
     },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
     "browserslist": {
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
@@ -2772,6 +2787,24 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "eccrypto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/eccrypto/-/eccrypto-1.0.3.tgz",
+      "integrity": "sha1-pBIObOmLAHLBzqr96tFW9ruLJOM=",
+      "requires": {
+        "elliptic": "^6.0.2",
+        "es6-promise": "^3.0.2",
+        "nan": "^2.1.0",
+        "secp256k1": "^2.0.4"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "3.3.1",
+          "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
+        }
+      }
+    },
     "ecurve": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/ecurve/-/ecurve-1.0.6.tgz",
@@ -4145,6 +4178,20 @@
         }
       }
     },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
     "encoding": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
@@ -5367,6 +5414,15 @@
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
     },
+    "hash.js": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
+      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
     "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
@@ -5385,6 +5441,16 @@
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
       "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
     },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
@@ -6734,6 +6800,16 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -6833,8 +6909,7 @@
     "nan": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
-      "dev": true
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
     },
     "natives": {
       "version": "1.1.4",
@@ -8467,6 +8542,20 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
+    "secp256k1": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-2.0.10.tgz",
+      "integrity": "sha1-x9ajwRnhykQIPDZ7BxXhhJB0F7M=",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.2.1",
+        "bluebird": "^3.0.2",
+        "bn.js": "^4.6.4",
+        "elliptic": "^6.0.2",
+        "nan": "^2.0.9",
+        "object-assign": "^4.0.1"
+      }
+    },
     "secure-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/secure-ls/-/secure-ls-1.2.1.tgz",
diff --git a/package.json b/package.json
index 506bd653..6da6afc5 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "bootstrap-vue": "^2.0.0-rc.11",
     "crypto-js": "^3.1.9-1",
     "dexie": "^2.0.4",
+    "eccrypto": "^1.0.3",
     "electron-compile": "^6.4.3",
     "electron-devtools-installer": "^2.2.4",
     "electron-squirrel-startup": "^1.0.0",
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 678c9921..fd93c068 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -1,7 +1,7 @@
 import BeetAPI from './BeetAPI';
 import BeetWS from './BeetWS';
 import CryptoJS from 'crypto-js';
-import store from './store/index.js';
+import store from '../store/index.js';
 
 let io = null;
 let vueInst = null;
@@ -55,9 +55,12 @@ const linkHandler = async (req) => {
 
 const authHandler = async (req) => {
    
-    let key=CryptoJS.SHA256(req.data.appid+' '+req.data.account_id).toString()
-    
-    return  {isLinked: true, counter: 1 , sharedKey: key};
+    // TODO: Check against blacklist;    
+    if (req.payload.apphash!=null & req.payload.apphash!=undefined) {
+        return {authenticate:true,link:true};
+    }else{
+        return {authenticate:true,link:false};
+    }
  };
 
 export default class BeetServer {
@@ -78,10 +81,9 @@ export default class BeetServer {
             let status=await authHandler(data);
             console.log(status);
             let result={};
-            result.original=data.data.data;
-            result.response=status;
-            result.id=data.id;
-            server2.respondAuth(data.client, result);
+            console.log(data);
+            status.id=data.id;
+            server2.respondAuth(data.client, status);
         });
     }
 
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index dfa6f789..8555867f 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -6,8 +6,10 @@ import WebSocket from "ws";
 import {
   v4 as uuidv4
 } from "uuid"
-const OTPAuth=require("otpauth");
+const OTPAuth = require("otpauth");
 import CryptoJS from 'crypto-js';
+import crypto from 'crypto';
+import eccrypto from 'eccrypto';
 
 export default class BeetWS extends EventEmitter {
   constructor(port, timeout) {
@@ -19,10 +21,10 @@ export default class BeetWS extends EventEmitter {
     this._clients = [];
     this._monitor = setInterval(function () {
       for (var clientid in self._clients) {
-        
+
         let client = self._clients[clientid];
         console.log(client);
-        if (client.isAlive === false || client.readyState!=1) {
+        if (client.isAlive === false || client.readyState != 1) {
           self.emit("disconnected", client.id);
           delete(self._clients[client.id]);
           console.log("Terminating client")
@@ -45,108 +47,114 @@ export default class BeetWS extends EventEmitter {
     this.isAlive = true;
   }
   _handleMessage(client, data) {
+
+    if (data.type == 'version') {
+      client.send('{ "id": "' + data.id + '", "error": false, "payload": { "version": "' + JSON.stringify(version) + '"}}');
+    }
     if (client.isAuthenticated) {
       if (client.isLinked) {
-        if (data.type == "api") {
-          var key = client.otp.generate();
-          if (key == data.nonce) {
+        if (data.type == 'api') {
+          let hash = CryptoJS.SHA256(data.id);
+          if (hash == client.next_hash) {
+            client.otp.counter = data.id;
+            var key = client.otp.generate();
             try {
               var msg = CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8);
-              this.emit("api", {
-                'client': client.id,
-                'id': data.id,
-                'payload': msg
+              client.next_hash = msg.next_hash;
+              this.emit('api', {
+                "client": client.id,
+                "id": data.id,
+                "payload": msg
               });
             } catch (e) {
-              client.send('{"id": ' + data.id + ', "result": "error" , "data": "Could not decrypt message"}');
+              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Could not decrypt message"}}');
             }
           } else {
-            client.send('{"id": ' + data.id + ', "result": "error" , "data": "Unexpected nonce. Please relink."}');
+            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Unexpected request id. Please relink"}}');
           }
         } else {
-          client.send('{"id": ' + data.id + ', "result": "error" , "data": "Beet could not understand your request"}');
+          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Beet could not understand your request"}}');
         }
       } else {
-        if (data.type == "link") {
-          this.emit("link", {
-            'client': client.id,
-            'data': data
+        if (data.type == 'link') {
+          this.emit('link', {
+            "id": data.id,
+            "client": client.id,
+            "payload": data.payload
           });
         } else {
-          client.send('{"id": ' + data.id + ', "result": "error" , "data": "This app is not yet linked"}');
+          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "This app is not yet linked"}}');
         }
       }
     } else {
-      if (data.type == "authenticate") {
-        this.emit("authenticate", {
-          'client': client.id,
-          'data': data
+      if (data.type == 'authenticate') {
+        this.emit('authenticate', {
+          "id": data.id,
+          "client": client.id,
+          "payload": data.payload
         });
       } else {
-        if (data.type == "version") {
-          console.log(version);
-          client.send("{ 'type': 'version', 'result': " + JSON.stringify(version) + '}');
-        } else {
-          
-          if (data.type == "link") {
-            this.emit("link", {
-              'client': client.id,
-              'data': data
-            });
-            console.log('Try link');
-          } else{
-            client.send('{"id": ' + data.id + ', "result": "error" , "data": "Must authenticate or link first"}');
-          }
-        }
+        client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Must authenticate first"}}');
       }
     }
   }
-  respondLink(client, data) {
-    if (data.response.isLinked == true) {
+  async respondLink(client, result) {
+    if (result.isLinked == true) {
+      this._clients[client].isLinked = true;
+      this._clients[client].apphash = result.apphash;
+      this._clients[client].chain = result.chain;
+      this._clients[client].next_hash = result.next_hash;
+      let secret = await eccrypto.derive(this._clients[client].pk, result.pubkey);
       let otp = new OTPAuth.HOTP({
         issuer: "Beet",
         label: "BeetAuth",
         algorithm: "SHA1",
         digits: 32,
-        counter: data.response.counter,
-        secret: OTPAuth.Secret.fromHex(data.response.sharedKey)
+        counter: 0,
+        secret: OTPAuth.Secret.fromHex(secret)
       });
       this._clients[client].otp = otp;
-      this._clients[client].isLinked = true;
-      this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": ' + JSON.stringify(data.response.identity) + '}');
+      this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
     } else {
-      this._clients[client].send('{"id": ' + data.id + ', "result": "error" , "data": "Could not link to Beet"}');
+      this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "message": "Could not link to Beet"}}');
     }
   }
-  respondAPI(client, data) {
+  respondAPI(client, result) {
 
+    this._clients[client].otp.counter = result.id;
     var key = this._clients[client].otp.generate();
-    var payload = CryptoJS.AES.encrypt(JSON.stringify(data.response), key).toString();
-    this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": "' + payload + '", "nonce": "' + key + '"}');
+    var payload = CryptoJS.AES.encrypt(JSON.stringify(result.response), key).toString();
+    this._clients[client].send('{"id": ' + result.id + ', "error": false , "encrypted": true, "payload": "' + payload + '"}');
   }
-  respondAuth(client, data) {
-    //this._clients[client].isAuthenticated = true;
-    if (data.response.isLinked == true) {
-      let otp = new OTPAuth.HOTP({
-        issuer: "Beet",
-        label: "BeetAuth",
-        algorithm: "SHA1",
-        digits: 32,
-        counter: data.response.counter,
-        secret: OTPAuth.Secret.fromHex(data.response.sharedKey)
-      });
-      this._clients[client].otp = otp;
-      let key=this._clients[client].otp.generate();
-      console.log(key);
-      console.log(data.original);
-      var msg = CryptoJS.AES.decrypt(data.original, key).toString(CryptoJS.enc.Utf8);
-      console.log(msg);
-      this._clients[client].isLinked = true;
+  respondAuth(client, result) {
+    if (result.authenticate) {
+      this._clients[client].isAuthenticated = true;
+      this._clients[client].origin = result.origin;
+      this._clients[client].app_name = result.app_name;
+      this._clients[client].browser = result.browser;
+      if (result.link) {
+        this._clients[client].isLinked = true;
+        this._clients[client].apphash = result.apphash;
+        this._clients[client].chain = result.chain;
+        this._clients[client].next_hash = result.next_hash;
+        let otp = new OTPAuth.HOTP({
+          issuer: "Beet",
+          label: "BeetAuth",
+          algorithm: "SHA1",
+          digits: 32,
+          counter: 0,
+          secret: OTPAuth.Secret.fromHex(this._clients[client].secret)
+        });
+        this._clients[client].otp = otp;
+        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
+      } else { 
+        this._clients[client].pk = crypto.randomBytes(32);
+        let pubkey = eccrypto.getPublic(this._clients[client].pk).toString('hex');
+        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
+      }
+    } else {
+      this._clients[client].send('{"id": ' + result.id + ', "error": true, "payload": { "message": "Could not authenticate"}}');
     }
-    this._clients[client].send('{"id": ' + data.id + ', "result": "success" , "data": ' + JSON.stringify(data.response) + '}');
-  }
-  authRejected(client, data) {
-    this._clients[client].send('{"id": ' + data.id + ', "result": "error" , "data": ' + JSON.stringify(data.response) + '}');
   }
   _handleConnection(client) {
     client.id = uuidv4();

From b1a7bf5a074cdfeb0e99ca846611cb2748257008 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 2 Oct 2018 08:34:35 +0300
Subject: [PATCH 21/35] WIP

---
 src/lib/BeetAPI.js    |  1 +
 src/lib/BeetServer.js | 17 ++++++++---------
 src/lib/BeetWS.js     | 15 +++++++++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 5ef32265..8ba73748 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -6,6 +6,7 @@ var popupQ = new Queue();
 export default class BeetAPI {
 
     static async handler(request, vueInst) {        
+        console.log(request);
         if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
         let result;
         if (popupQ.isEmpty()) {
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index fd93c068..0249e8b8 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -43,13 +43,15 @@ const socketHandler = (socket) => {
 const linkHandler = async (req) => {
     let userResponse;
     try {
-       userResponse = await BeetAPI.handler(Object.assign(req.data, {}), vueInst);
-       store.dispatch('OriginStore/addApp', {appname:req.data.appname , apphash: req.data.appid , origin: req.data.origin, account_id: userResponse.id, nonce: 0});
+        console.log(req);
+       userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
+       console.log(userResponse);
+       store.dispatch('OriginStore/addApp', {appname:req.app_name , apphash: req.data.appid , origin: req.data.origin, account_id: userResponse.id, nonce: 0});
+       console.log('here');
        let key=CryptoJS.SHA256(req.data.appid+' '+userResponse.id).toString();
-
        return  { isLinked: true, counter: 0 , sharedKey: key, identity: userResponse };
     }catch(e) {
-        
+        console.log(e);
     }
 };
 
@@ -57,9 +59,9 @@ const authHandler = async (req) => {
    
     // TODO: Check against blacklist;    
     if (req.payload.apphash!=null & req.payload.apphash!=undefined) {
-        return {authenticate:true,link:true};
+        return Object.assign(req.payload, {authenticate:true,link:true});
     }else{
-        return {authenticate:true,link:false};
+        return Object.assign(req.payload, {authenticate:true,link:false});
     }
  };
 
@@ -79,9 +81,6 @@ export default class BeetServer {
         });
         server2.on('authenticate',async (data)=> {
             let status=await authHandler(data);
-            console.log(status);
-            let result={};
-            console.log(data);
             status.id=data.id;
             server2.respondAuth(data.client, status);
         });
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 8555867f..eb2fa244 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -77,11 +77,17 @@ export default class BeetWS extends EventEmitter {
         }
       } else {
         if (data.type == 'link') {
-          this.emit('link', {
+          console.log(client);
+          let linkobj= {
             "id": data.id,
             "client": client.id,
-            "payload": data.payload
-          });
+            "payload": data.payload,
+            "origin": client.origin,
+            "appname": client.app_name,
+            "type": 'link'
+          };
+
+          this.emit('link',linkobj);
         } else {
           client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "This app is not yet linked"}}');
         }
@@ -98,7 +104,7 @@ export default class BeetWS extends EventEmitter {
       }
     }
   }
-  async respondLink(client, result) {
+  async respondLink(client, result) {    
     if (result.isLinked == true) {
       this._clients[client].isLinked = true;
       this._clients[client].apphash = result.apphash;
@@ -128,6 +134,7 @@ export default class BeetWS extends EventEmitter {
   }
   respondAuth(client, result) {
     if (result.authenticate) {
+      console.log(result);
       this._clients[client].isAuthenticated = true;
       this._clients[client].origin = result.origin;
       this._clients[client].app_name = result.app_name;

From 54eaedf8bd17b375550e5457ad11b646a7f0e68d Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Wed, 3 Oct 2018 17:31:55 +0300
Subject: [PATCH 22/35] WIP

---
 src/lib/BeetDB.js     |  2 +-
 src/lib/BeetServer.js | 10 ++++++----
 src/lib/BeetWS.js     |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index bb2b3dab..a3c6cbcf 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -2,7 +2,7 @@ import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
 
 BeetDB.version(1).stores({
-    apps: `++id,appname, origin, apphash, account_id, nonce`,
+    apps: `++id,appname, origin, apphash, account_id, chain, secret`,
     settings: `++id,setting, value`
 }); 
 
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 0249e8b8..0b1b5d09 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -2,6 +2,7 @@ import BeetAPI from './BeetAPI';
 import BeetWS from './BeetWS';
 import CryptoJS from 'crypto-js';
 import store from '../store/index.js';
+import eccrypto from 'eccrypto';
 
 let io = null;
 let vueInst = null;
@@ -46,10 +47,11 @@ const linkHandler = async (req) => {
         console.log(req);
        userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
        console.log(userResponse);
-       store.dispatch('OriginStore/addApp', {appname:req.app_name , apphash: req.data.appid , origin: req.data.origin, account_id: userResponse.id, nonce: 0});
-       console.log('here');
-       let key=CryptoJS.SHA256(req.data.appid+' '+userResponse.id).toString();
-       return  { isLinked: true, counter: 0 , sharedKey: key, identity: userResponse };
+       let apphash=CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+userResponse.id).toString();    
+       let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey,'hex'));
+       store.dispatch('OriginStore/addApp', {appname:req.appname , apphash: apphash , origin: req.origin, account_id: userResponse.id, chain: req.chain, secret: secret});
+       
+       return  { isLinked: true, sharedKey: secret, identity: userResponse };
     }catch(e) {
         console.log(e);
     }
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index eb2fa244..706a01c4 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -84,6 +84,8 @@ export default class BeetWS extends EventEmitter {
             "payload": data.payload,
             "origin": client.origin,
             "appname": client.app_name,
+            "browser":client.browser,
+            "key":client.pk,
             "type": 'link'
           };
 
@@ -110,7 +112,6 @@ export default class BeetWS extends EventEmitter {
       this._clients[client].apphash = result.apphash;
       this._clients[client].chain = result.chain;
       this._clients[client].next_hash = result.next_hash;
-      let secret = await eccrypto.derive(this._clients[client].pk, result.pubkey);
       let otp = new OTPAuth.HOTP({
         issuer: "Beet",
         label: "BeetAuth",

From dcb1a441021961c6023ac5103cf98b99462334c8 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 4 Oct 2018 15:31:44 +0300
Subject: [PATCH 23/35] WIP

---
 src/lib/BeetAPI.js               |  5 +-
 src/lib/BeetDB.js                |  4 +-
 src/lib/BeetServer.js            | 11 +++--
 src/lib/BeetWS.js                | 13 +++--
 src/lib/ssl/beet.cert            | 82 ++++++++++++++++++++++++++++++++
 src/lib/ssl/beet.key             | 28 +++++++++++
 src/store/modules/OriginStore.js | 21 --------
 7 files changed, 129 insertions(+), 35 deletions(-)
 create mode 100644 src/lib/ssl/beet.cert
 create mode 100644 src/lib/ssl/beet.key

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 8ba73748..c6364d76 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -76,10 +76,7 @@ export default class BeetAPI {
                 id: request.id,
                 result: response
             });
-            return {
-                id: request.id,
-                response: { isLinked: true, counter: 0 , sharedKey: 'ddfe', identity:  response }
-            };
+            return Object.assign(request, { identity: response});
         } catch (e) {
             console.log(e);
             return { id: request.id, response: { isLinked: false }};
diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index a3c6cbcf..fb8a275d 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -1,8 +1,8 @@
 import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
-
+ 
 BeetDB.version(1).stores({
-    apps: `++id,appname, origin, apphash, account_id, chain, secret`,
+    apps: `++id,appname, origin, &apphash, account_id, chain, secret,next_hash`,
     settings: `++id,setting, value`
 }); 
 
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 0b1b5d09..b43d6e4b 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -47,11 +47,12 @@ const linkHandler = async (req) => {
         console.log(req);
        userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
        console.log(userResponse);
-       let apphash=CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+userResponse.id).toString();    
+       let apphash=CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+req.payload.chain+' '+userResponse.identity.id).toString();    
+       console.log(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+req.payload.chain+' '+userResponse.identity.id);
        let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey,'hex'));
-       store.dispatch('OriginStore/addApp', {appname:req.appname , apphash: apphash , origin: req.origin, account_id: userResponse.id, chain: req.chain, secret: secret});
-       
-       return  { isLinked: true, sharedKey: secret, identity: userResponse };
+       store.dispatch('OriginStore/addApp', {appname:req.appname , apphash: apphash , origin: req.origin, account_id: userResponse.identity.id, chain: req.payload.chain, secret: secret.toString('hex'),next_hash:req.payload.next_hash});
+       let response = Object.assign(req,  {isLinked: true, apphash: apphash,  account_id: userResponse.identity.id, secret: secret.toString('hex')});
+       return response;
     }catch(e) {
         console.log(e);
     }
@@ -70,7 +71,7 @@ const authHandler = async (req) => {
 export default class BeetServer {
 
     static initialize(vue) {
-        vueInst = vue;
+        vueInst = vue; 
         const server = window.require('http').createServer();
         server.listen(60555, 'localhost');
         const server2=new BeetWS(60556,10000);
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 706a01c4..76d7a1f2 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -10,15 +10,22 @@ const OTPAuth = require("otpauth");
 import CryptoJS from 'crypto-js';
 import crypto from 'crypto';
 import eccrypto from 'eccrypto';
+import Https from 'https';
+import Fs from 'fs';
 
 export default class BeetWS extends EventEmitter {
   constructor(port, timeout) {
     super() // required
     var self = this;
+    const httpsServer = Https.createServer({
+      key: Fs.readFileSync(__dirname+'/ssl/beet.key'),
+      cert: Fs.readFileSync(__dirname+'/ssl/beet.cert')
+    });
     const server = new WebSocket.Server({
-      port: port
+      server: httpsServer
     });
-    this._clients = [];
+    httpsServer.listen(port); 
+    this._clients = []; 
     this._monitor = setInterval(function () {
       for (var clientid in self._clients) {
 
@@ -118,7 +125,7 @@ export default class BeetWS extends EventEmitter {
         algorithm: "SHA1",
         digits: 32,
         counter: 0,
-        secret: OTPAuth.Secret.fromHex(secret)
+        secret: OTPAuth.Secret.fromHex(result.secret)
       });
       this._clients[client].otp = otp;
       this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
diff --git a/src/lib/ssl/beet.cert b/src/lib/ssl/beet.cert
new file mode 100644
index 00000000..3c3ef703
--- /dev/null
+++ b/src/lib/ssl/beet.cert
@@ -0,0 +1,82 @@
+-----BEGIN CERTIFICATE-----
+MIIGDTCCBPWgAwIBAgISA0kxB7b16zDEhq+c1tczTb6NMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODEwMDQwNjQ2MDdaFw0x
+OTAxMDIwNjQ2MDdaMBwxGjAYBgNVBAMTEWxvY2FsLmdldC1iZWV0LmlvMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuegh67fv6BjYgMXoRtrESxWnU5f
+a3HrIE5mdTq7MMyRzS/kqdA2ckJ14lBaM3EXjmHO4P/LkeUQPUPYFQqGWZScm9YV
+Jg+Tm+2XNzUj29TE1P8sGp9UkDTRdGZDol8uZ9Bf5opZCWFDN5cUSrbNMg75Bu0F
+eYCOtHuGqXRnm4SiNP4zujF4Y1xDvvoSvP27KUszIc+cd44KRQA0X19zjnT1Kya0
+ezYaL5plkXPXJmqG/q9jS6VM4YzygS9Zy/6dOGnMe7qYzhO4065JDd3dieAAdKkO
+/Nt0Qb28XukXeSaxnOwAa8gbC5zgzNvogxBbasupG90bYkUh78Vf0f2z4wIDAQAB
+o4IDGTCCAxUwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS7OPHVkyhc59JrrvDx0Zwa
+uaK3qjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcB
+AQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlw
+dC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
+dC5vcmcvMBwGA1UdEQQVMBOCEWxvY2FsLmdldC1iZWV0LmlvMIH+BgNVHSAEgfYw
+gfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAmBggrBgEFBQcCARYaaHR0
+cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUFBwICMIGeDIGbVGhpcyBD
+ZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBieSBSZWx5aW5nIFBh
+cnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0aWZpY2F0
+ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcvcmVwb3Np
+dG9yeS8wggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdgBvU3asMfAxGdiZAKRRFf93
+FRwR2QLBACkGjbIImjfZEwAAAWY+CoHdAAAEAwBHMEUCIAj3QjbYX/PrI2qGwTGJ
+SokAt2nGR81/gH5A8JWJXf0uAiEAuKTNls6ftP1QmY4KiuMgK5sSLibJcp6k7x1/
+N27a3HQAdgApPFGWVMg5ZbqqUPxYB9S3b79Yeily3KTDDPTlRUf0eAAAAWY+CoMP
+AAAEAwBHMEUCIQDkjPhOXSDkLgKbbzHGtwg5nonD0ptm0OQscmdNbX7cZgIgfIrx
+JknG0YNQKdFcsXnPtKQcW2dxUw3RyugOQfWA7AkwDQYJKoZIhvcNAQELBQADggEB
+AAEvlCxnjHt7NHFRmqmwYQ6K1/36tn932023kKin6VzyYDahyBBRXR8g7oSxflMG
+qjNuz3AR3miTCmK7Nqjr6rCJ4X2Dd9iBZlGIuYrZUZjRoQEJV9zCfWv0hQwi8Eiw
+7enPYYIma+GHPtkrOzGjn68wsRr//EXgmL/HusUW6Zb7gSbOHjS26GpXzV/HTT1C
+pTCgWXE3APtL6DkTG1fTst4T2LC0pXfNVHgM6Syk8FxnSkjCzBHB8DuE281UdkbQ
+fvrB0QEhXOJZQbpgd56TSf6HVlEeJYVJdte/nx8rWpgLLBaXRRPukrjRuHI+b2kz
+hmVbgv3i+smUEbFLmnwq5vA=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/lib/ssl/beet.key b/src/lib/ssl/beet.key
new file mode 100644
index 00000000..15031bda
--- /dev/null
+++ b/src/lib/ssl/beet.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCy56CHrt+/oGNi
+AxehG2sRLFadTl9rcesgTmZ1OrswzJHNL+Sp0DZyQnXiUFozcReOYc7g/8uR5RA9
+Q9gVCoZZlJyb1hUmD5Ob7Zc3NSPb1MTU/ywan1SQNNF0ZkOiXy5n0F/milkJYUM3
+lxRKts0yDvkG7QV5gI60e4apdGebhKI0/jO6MXhjXEO++hK8/bspSzMhz5x3jgpF
+ADRfX3OOdPUrJrR7NhovmmWRc9cmaob+r2NLpUzhjPKBL1nL/p04acx7upjOE7jT
+rkkN3d2J4AB0qQ7823RBvbxe6Rd5JrGc7ABryBsLnODM2+iDEFtqy6kb3RtiRSHv
+xV/R/bPjAgMBAAECggEAIGZ8lzYfhZfph82hkObjTBfok9Kmy1G1UIOCYMbDMgJK
+gYuj8PEpeyX4LYV54IkhyAKEshEBcCm4+C96Sc0/KagVeM+bwundRMcRtMjl9qEh
+CKYx+ZxTd05phJgktZphUCHXzGvP1jgMMVwmK6XRobg+d3ejny6eKaeZasUPIoXk
+RWil0Bz0g6nFu+uwvUygMHu7IsdiTcYbOPA51m9E75iVGvpilYsaUm7H2vPzlnOm
++Cx/HhI8XyNSxmuEDA2zuvy71ca0m+EH/snQLPb6oeZhiiLZT343RWtbad2WxsEr
+dRtVxFg9b7Baccnv3Lk0qav+EAg6mxuNvh39vlsW0QKBgQDazoHIxFzEuiZdX+ir
+0REcRBlYSl1UPMJtAQ89NryQntL70AZD+T6qWA01ftDHiALVzaFt7RqlatAnRRF5
+1dmHN0M9iMTmsBDMvVhmcexvNFSBnVoWvQzGBJUeCWk2BdBdmDcDRy9jgqeAi5pp
+LRKg/6WJkVS0F4X69LvpaygFaQKBgQDRUMSakVjMEEKS4ptdBY/MtH5/OlmE9se1
+39o3GJCyLAOfVll0iuccudPXR6K5zzXF27fkiIzNLfiQGUbd9wNV4Fslnh43GQlq
+yUY6Hlg8jlXSpW7cPt5YOvz9CaniAQCQ7DWVrzKM35rZUUXytvaEEV2PjB9kkSpU
+sSXkp2TJawKBgQCTcv460TjCyb74xZ0BzA1/wtRhjxt9nMRYuJIQakaAHseHMhRG
+0jvMhzG/jwoarClc8wmKDnIabvR+wiiYtee1GySQ3w3xd0ya7C4aO0NdXSJlhigj
+kpp9BrGGYEkqQpi7ucu4xcvFf1JpaapQnjMjk6N2JR2zjvaWuz22eqOpoQKBgBL2
+PylFe4bY/j7yOmLd6x3/R+pcrdlmxcbLJaiSGCGb7SQVHXt6Td+DUhaRjcNJazSm
+Z+1TFXZM8NSVBZ98DhhMf9VTkqcpJHpBC5SeRR4PQuUXSYi4RUo25c5CftpTfuqi
+C2So/2pVo2CGhVCslH54WEJ1zi49HFmZxrYFGBNLAoGAEXqB+vLtV9DliEN/de8i
+FwgII/+ELfUT34OACwJP0kPwBbNKMHPZdckewBY2lUMc/n1gWE3JcGYrzZjZArjA
+aezKgsSNdukoh7KuWxXivriU/GZSshzf2bzFisprkphbAgRa8pzu/rqq9DHrRF5E
+eSi13QAI65CYC7rmDIfE/b8=
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index 80278cfc..24eaf048 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -2,7 +2,6 @@ import Vue from 'vue/dist/vue.js';
 import BeetDB from '../../lib/BeetDB.js';
 const LOAD_APPS = 'LOAD_APPS';
 const ADD_APP = 'ADD_APP';
-const INC_NONCE = 'INC_NONCE';
 
 const mutations = {
     [LOAD_APPS](state, apps) {
@@ -10,9 +9,6 @@ const mutations = {
     },
     [ADD_APP](state, app) {
         state.apps.push(app);
-    },
-    [INC_NONCE](state, app_id) {
-        state.app.find(o => o.id === app_id).nonce++;
     }
 };
 
@@ -41,23 +37,6 @@ const actions = {
                 reject();
             });
         });
-    },
-    incNonce({
-        commit
-    }, payload) {
-
-        return new Promise((resolve, reject) => {
-            BeetDB.apps.update(payload, function (appobj) {
-                appobj.nonce++;
-                return appobj;
-            }).then((id) => {
-                payload.id = id;
-                commit(INC_NONCE, payload);
-                resolve();
-            }).catch(() => {
-                reject();
-            });
-        });
     }
 }
 

From 80cceb93187bc9d076e0cba41b150de1e2b1d628 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 4 Oct 2018 15:31:56 +0300
Subject: [PATCH 24/35] WIP LINT

---
 src/lib/BeetServer.js | 65 ++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index b43d6e4b..f93be546 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -29,7 +29,7 @@ const socketHandler = (socket) => {
             plugin: req.plugin
         }), vueInst));
     });
-    socket.on('link',async req=> {
+    socket.on('link', async req => {
         //TODO
         //socket.emit('link',await vueInst.)
     })
@@ -45,46 +45,65 @@ const linkHandler = async (req) => {
     let userResponse;
     try {
         console.log(req);
-       userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
-       console.log(userResponse);
-       let apphash=CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+req.payload.chain+' '+userResponse.identity.id).toString();    
-       console.log(req.browser + ' ' + req.origin + ' ' + req.appname+ ' '+req.payload.chain+' '+userResponse.identity.id);
-       let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey,'hex'));
-       store.dispatch('OriginStore/addApp', {appname:req.appname , apphash: apphash , origin: req.origin, account_id: userResponse.identity.id, chain: req.payload.chain, secret: secret.toString('hex'),next_hash:req.payload.next_hash});
-       let response = Object.assign(req,  {isLinked: true, apphash: apphash,  account_id: userResponse.identity.id, secret: secret.toString('hex')});
-       return response;
-    }catch(e) {
+        userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
+        console.log(userResponse);
+        let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
+        console.log(req.browser + ' ' + req.origin + ' ' + req.appname + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
+        let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
+        store.dispatch('OriginStore/addApp', {
+            appname: req.appname,
+            apphash: apphash,
+            origin: req.origin,
+            account_id: userResponse.identity.id,
+            chain: req.payload.chain,
+            secret: secret.toString('hex'),
+            next_hash: req.payload.next_hash
+        });
+        let response = Object.assign(req, {
+            isLinked: true,
+            apphash: apphash,
+            account_id: userResponse.identity.id,
+            secret: secret.toString('hex')
+        });
+        return response;
+    } catch (e) {
         console.log(e);
     }
 };
 
 const authHandler = async (req) => {
-   
+
     // TODO: Check against blacklist;    
-    if (req.payload.apphash!=null & req.payload.apphash!=undefined) {
-        return Object.assign(req.payload, {authenticate:true,link:true});
-    }else{
-        return Object.assign(req.payload, {authenticate:true,link:false});
+    if (req.payload.apphash != null & req.payload.apphash != undefined) {
+        return Object.assign(req.payload, {
+            authenticate: true,
+            link: true
+        });
+    } else {
+        return Object.assign(req.payload, {
+            authenticate: true,
+            link: false
+        });
     }
- };
+};
 
 export default class BeetServer {
 
     static initialize(vue) {
-        vueInst = vue; 
+        vueInst = vue;
         const server = window.require('http').createServer();
         server.listen(60555, 'localhost');
-        const server2=new BeetWS(60556,10000);
+        const server2 = new BeetWS(60556, 10000);
         io = window.require('socket.io').listen(server);
         console.log('Beet listening...');
-        server2.on('link',async (data)=> {
-            let status=await linkHandler(data);
+        server2.on('link', async (data) => {
+            let status = await linkHandler(data);
             console.log(status);
             server2.respondLink(data.client, status);
         });
-        server2.on('authenticate',async (data)=> {
-            let status=await authHandler(data);
-            status.id=data.id;
+        server2.on('authenticate', async (data) => {
+            let status = await authHandler(data);
+            status.id = data.id;
             server2.respondAuth(data.client, status);
         });
     }

From f16747f622acd938dea6678a765df015b98d35f6 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Thu, 4 Oct 2018 18:10:54 +0300
Subject: [PATCH 25/35] WIP

---
 src/lib/BeetServer.js | 18 ++++++++++++++----
 src/lib/BeetWS.js     |  8 ++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index f93be546..c3f22e36 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -75,10 +75,20 @@ const authHandler = async (req) => {
 
     // TODO: Check against blacklist;    
     if (req.payload.apphash != null & req.payload.apphash != undefined) {
-        return Object.assign(req.payload, {
-            authenticate: true,
-            link: true
-        });
+        let apps=store.state.OriginStore.apps;        
+        const app = apps.find(x => x.apphash === req.payload.apphash);
+        if (!app) {          
+            return Object.assign(req.payload, {
+                authenticate: false,
+                link: false
+            });  
+        }else{
+            return Object.assign(req.payload, {
+                authenticate: true,
+                link: true,
+                app: app
+            });
+        }
     } else {
         return Object.assign(req.payload, {
             authenticate: true,
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 76d7a1f2..bade20e9 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -150,18 +150,18 @@ export default class BeetWS extends EventEmitter {
       if (result.link) {
         this._clients[client].isLinked = true;
         this._clients[client].apphash = result.apphash;
-        this._clients[client].chain = result.chain;
-        this._clients[client].next_hash = result.next_hash;
+        this._clients[client].chain = result.app.chain;
+        this._clients[client].next_hash = result.app.next_hash;
         let otp = new OTPAuth.HOTP({
           issuer: "Beet",
           label: "BeetAuth",
           algorithm: "SHA1",
           digits: 32,
           counter: 0,
-          secret: OTPAuth.Secret.fromHex(this._clients[client].secret)
+          secret: OTPAuth.Secret.fromHex(result.app.secret)
         });
         this._clients[client].otp = otp;
-        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
+        this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
       } else { 
         this._clients[client].pk = crypto.randomBytes(32);
         let pubkey = eccrypto.getPublic(this._clients[client].pk).toString('hex');

From 9636e1c8d1e6a1a8f95d2d56d0ea7b5f463ab9ca Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Fri, 5 Oct 2018 08:13:08 +0300
Subject: [PATCH 26/35] WIP

---
 src/components/header-small.vue |  2 +-
 src/lib/BeetDB.js               |  2 +-
 src/lib/BeetServer.js           | 25 +++++++++++++++++--------
 src/lib/BeetWS.js               |  4 ++--
 src/translations/common/en.json |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/components/header-small.vue b/src/components/header-small.vue
index 002778de..c7de9174 100644
--- a/src/components/header-small.vue
+++ b/src/components/header-small.vue
@@ -9,7 +9,7 @@
                     width="56"
                     height="56"
                 >
-                <h4 class="h4 font-weight-normal align-self-center">{{ $t('app_name') }}</h4>
+                <h4 class="h4 font-weight-normal align-self-center">{{ $t('appName') }}</h4>
                 <LangSelect ref="langswitch" />
             </div>
         </div>
diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index fb8a275d..f843dec5 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -2,7 +2,7 @@ import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
  
 BeetDB.version(1).stores({
-    apps: `++id,appname, origin, &apphash, account_id, chain, secret,next_hash`,
+    apps: `++id,appName, origin, &apphash, account_id, chain, secret,next_hash`,
     settings: `++id,setting, value`
 }); 
 
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index c3f22e36..89d04fe9 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -47,11 +47,11 @@ const linkHandler = async (req) => {
         console.log(req);
         userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
         console.log(userResponse);
-        let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appname + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
-        console.log(req.browser + ' ' + req.origin + ' ' + req.appname + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
+        let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
+        console.log(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
         let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
         store.dispatch('OriginStore/addApp', {
-            appname: req.appname,
+            appName: req.appName,
             apphash: apphash,
             origin: req.origin,
             account_id: userResponse.identity.id,
@@ -83,11 +83,20 @@ const authHandler = async (req) => {
                 link: false
             });  
         }else{
-            return Object.assign(req.payload, {
-                authenticate: true,
-                link: true,
-                app: app
-            });
+            console.log(req);
+            console.log(app);
+            if (req.payload.origin==app.origin && req.payload.appName==app.appName)  {
+                return Object.assign(req.payload, {
+                    authenticate: true,
+                    link: true,
+                    app: app
+                });
+            }else{
+                return Object.assign(req.payload, {
+                    authenticate: false,
+                    link: false
+                });
+            }
         }
     } else {
         return Object.assign(req.payload, {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index bade20e9..7831bd96 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -90,7 +90,7 @@ export default class BeetWS extends EventEmitter {
             "client": client.id,
             "payload": data.payload,
             "origin": client.origin,
-            "appname": client.app_name,
+            "appName": client.appName,
             "browser":client.browser,
             "key":client.pk,
             "type": 'link'
@@ -145,7 +145,7 @@ export default class BeetWS extends EventEmitter {
       console.log(result);
       this._clients[client].isAuthenticated = true;
       this._clients[client].origin = result.origin;
-      this._clients[client].app_name = result.app_name;
+      this._clients[client].appName = result.appName;
       this._clients[client].browser = result.browser;
       if (result.link) {
         this._clients[client].isLinked = true;
diff --git a/src/translations/common/en.json b/src/translations/common/en.json
index 3b32b41d..f9f9c4a3 100644
--- a/src/translations/common/en.json
+++ b/src/translations/common/en.json
@@ -1,5 +1,5 @@
 {
-    "app_name": "Beet",
+    "appName": "Beet",
     "slogan": "The BitShares companion",
     "welcome": "Welcome to Beet!",
     "no_wallet": "There is no wallet stored in this computer.",

From 752aa6fd4cabea91212fab6577a61adbb30e9eda Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Fri, 5 Oct 2018 18:10:33 +0300
Subject: [PATCH 27/35] Improving

---
 src/components/dashboard.vue     | 12 ++++++------
 src/lib/BeetAPI.js               |  1 +
 src/lib/BeetServer.js            | 14 +++++++++++++-
 src/lib/BeetWS.js                | 27 +++++++++++++++++++--------
 src/store/modules/OriginStore.js | 18 ++++++++++++++++++
 5 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 44e81336..e815108e 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -181,7 +181,7 @@
                 this.$data.incoming = request;
 
                 this.$data.incoming.action = "vote";
-                let entity_id = this.$data.incoming.id.split(".");
+                let entity_id = this.$data.incoming.params.id.split(".");
                 if (entity_id[0] != "1") {
                     return Promise.reject();
                 }
@@ -205,7 +205,7 @@
                         "Commitee member: " +
                         objextradata[0].name +
                         "\nCommittee Member ID: " +
-                        this.$data.incoming.id;
+                        this.$data.incoming.params.id;
                     this.$data.incoming.vote_id = objdata[0].vote_id;
                     break;
                 case "6":
@@ -217,7 +217,7 @@
                         "Witness: " +
                         objextradata[0].name +
                         "\nWitness ID: " +
-                        this.$data.incoming.id;
+                        this.$data.incoming.params.id;
                     this.$data.incoming.vote_id = objdata[0].vote_id;
                     break;
                 case "14":
@@ -229,7 +229,7 @@
                         "Proposal: " +
                         objdata[0].name +
                         "\nProposal ID: " +
-                        this.$data.incoming.id +
+                        this.$data.incoming.params.id +
                         "\nDaily Pay: " +
                         this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
                         "BTS\nWorker: " +
@@ -272,8 +272,8 @@
                 let tr = new TransactionBuilder();
                 Apis.instance().init_promise.then(() => {
                     tr.add_type_operation(
-                        this.$data.incoming.op_type,
-                        this.$data.incoming.op_data
+                        this.$data.incoming.params.op_type,
+                        this.$data.incoming.params.op_data
                     );
                     tr.set_required_fees().then(async () => {
                         this.$refs.loaderAnimModal.show();
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index c6364d76..892717b4 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -58,6 +58,7 @@ export default class BeetAPI {
             
             console.log(vue);
             let response = await vue.requestAccess(request.payload);
+            console.log(response);
             return {
                 id: request.id,
                 result: response
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 89d04fe9..53cd1728 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -115,7 +115,8 @@ export default class BeetServer {
         const server2 = new BeetWS(60556, 10000);
         io = window.require('socket.io').listen(server);
         console.log('Beet listening...');
-        server2.on('link', async (data) => {
+        server2.on('link', async (data) => { 
+            
             let status = await linkHandler(data);
             console.log(status);
             server2.respondLink(data.client, status);
@@ -125,6 +126,17 @@ export default class BeetServer {
             status.id = data.id;
             server2.respondAuth(data.client, status);
         });
+        server2.on('api', async (data) => {
+            console.log(data);
+            store.dispatch('OriginStore/newRequest', {
+                apphash: data.payload.apphash,
+                next_hash: data.payload.next_hash
+            });
+            let status = await BeetAPI.handler(data, vueInst);
+            console.log(status);
+            status.id = data.id;
+            server2.respondAPI(data.client, status);
+        });
     }
 
     static open() {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 7831bd96..99cda0f1 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -54,26 +54,36 @@ export default class BeetWS extends EventEmitter {
     this.isAlive = true;
   }
   _handleMessage(client, data) {
-
+ 
     if (data.type == 'version') {
       client.send('{ "id": "' + data.id + '", "error": false, "payload": { "version": "' + JSON.stringify(version) + '"}}');
     }
     if (client.isAuthenticated) {
       if (client.isLinked) {
         if (data.type == 'api') {
-          let hash = CryptoJS.SHA256(data.id);
+          let hash =  CryptoJS.SHA256(''+data.id).toString();
+          console.log(hash);
+          console.log(client.next_hash);
           if (hash == client.next_hash) {
             client.otp.counter = data.id;
             var key = client.otp.generate();
             try {
-              var msg = CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8);
+              var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
+
+              msg.origin=client.origin;
+              msg.appName=client.appName;
+              msg.apphash=client.apphash;
+              msg.chain=client.chain;
+              msg.account_id=client.account_id;
               client.next_hash = msg.next_hash;
               this.emit('api', {
                 "client": client.id,
                 "id": data.id,
+                "type":msg.method,
                 "payload": msg
               });
             } catch (e) {
+              console.log (e);
               client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Could not decrypt message"}}');
             }
           } else {
@@ -133,12 +143,12 @@ export default class BeetWS extends EventEmitter {
       this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "message": "Could not link to Beet"}}');
     }
   }
-  respondAPI(client, result) {
-
-    this._clients[client].otp.counter = result.id;
+  respondAPI(client, response) {
+    this._clients[client].otp.counter = response.id;
     var key = this._clients[client].otp.generate();
-    var payload = CryptoJS.AES.encrypt(JSON.stringify(result.response), key).toString();
-    this._clients[client].send('{"id": ' + result.id + ', "error": false , "encrypted": true, "payload": "' + payload + '"}');
+    
+    var payload = CryptoJS.AES.encrypt(JSON.stringify(response.result), key).toString();
+    this._clients[client].send('{"id": ' + response.id + ', "error": false , "encrypted": true, "payload": "' + payload + '"}');
   }
   respondAuth(client, result) {
     if (result.authenticate) {
@@ -151,6 +161,7 @@ export default class BeetWS extends EventEmitter {
         this._clients[client].isLinked = true;
         this._clients[client].apphash = result.apphash;
         this._clients[client].chain = result.app.chain;
+        this._clients[client].account_id = result.app.account_id;
         this._clients[client].next_hash = result.app.next_hash;
         let otp = new OTPAuth.HOTP({
           issuer: "Beet",
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index 24eaf048..7c93db23 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -2,6 +2,7 @@ import Vue from 'vue/dist/vue.js';
 import BeetDB from '../../lib/BeetDB.js';
 const LOAD_APPS = 'LOAD_APPS';
 const ADD_APP = 'ADD_APP';
+const NEW_REQUEST = 'NEW_REQUEST';
 
 const mutations = {
     [LOAD_APPS](state, apps) {
@@ -9,6 +10,9 @@ const mutations = {
     },
     [ADD_APP](state, app) {
         state.apps.push(app);
+    },
+    [NEW_REQUEST]() {
+
     }
 };
 
@@ -24,6 +28,20 @@ const actions = {
                 reject();
             });
         });
+    },    
+    newRequest({dispatch,
+        commit
+    }, payload) {
+        return new Promise((resolve, reject) => {
+            BeetDB.apps.where('apphash').equals(payload.apphash).modify({next_hash: payload.next_hash}).then(() => {            
+            dispatch('loadApps');
+            commit(NEW_REQUEST, payload);
+            resolve();
+        }).catch((e) => {
+            console.log(e);
+            reject();
+        });
+    });
     },
     addApp({
         commit

From 005705396bb243e30a521ed8e787a9df378b4a4e Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 14 Oct 2018 09:09:51 +0300
Subject: [PATCH 28/35] *Working* alpha version

---
 src/components/create.vue        |  42 ++++++++---
 src/components/dashboard.vue     |   6 +-
 src/components/popups.vue        |  80 ++++++++++++++++-----
 src/components/start.vue         |   2 +-
 src/config/config.js             |   3 +
 src/index.js                     |  27 ++++---
 src/lib/BeetAPI.js               |  13 +++-
 src/lib/BeetServer.js            |   2 +
 src/lib/BeetWS.js                | 116 ++++++++++++++++---------------
 src/store/modules/WalletStore.js |   8 ++-
 src/translations/common/en.json  |   8 ++-
 11 files changed, 207 insertions(+), 100 deletions(-)

diff --git a/src/components/create.vue b/src/components/create.vue
index da7b73b2..8733ad50 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -16,6 +16,26 @@
                 required=""
                 @focus="s1c=''"
             >
+            <p class="my-3 font-weight-bold">{{ $t('chain_cta') }}</p>
+            <select                
+                id="chain-select"
+                v-model="selectedChain"
+                class="form-control mb-3"
+                :class="s1c"
+                :placeholder="$t('chain_placeholder')"
+                required=""
+            >
+                <option
+                    selected
+                    disabled
+                    value="0"
+                >{{ $t('select_chain') }}</option>
+                <option
+                    v-for="chain in chainList"
+                    :key="chain.short"
+                    :value="chain.short"
+                >{{ chain.name }} ({{ chain.short }})</option>
+            </select>
             <div class="row">
                 <div class="col-6">
                     <router-link
@@ -39,13 +59,13 @@
             id="step2"
         >
             <h4 class="h4 mt-3 font-weight-bold">{{ $t('step_counter',{ 'step_no' : 2}) }}</h4>
-            <p class="mb-2 font-weight-bold">{{ $t('account_name',{ 'chain' : 'BTS'}) }}</p>
+            <p class="mb-2 font-weight-bold">{{ $t('account_name',{ 'chain' : selectedChain}) }}</p>
             <input
                 id="inputAccount"
                 v-model="accountname"
                 type="text"
                 class="form-control mb-3"
-                :placeholder="$t('account_name',{ 'chain' : 'BTS'})"
+                :placeholder="$t('account_name',{ 'chain' : selectedChain})"
                 required=""
             >
             <p class="my-3 font-weight-normal">{{ $t('keys_cta') }}</p>
@@ -131,7 +151,7 @@
                 class="btn btn-lg btn-primary btn-block"
                 type="submit"
                 @click="verifyAndCreate"
-            >{{ $t('next_lbl') }}</button>
+            >{{ $t('next_btn') }}</button>
         </div>
         <b-modal
             id="loaderAnim"
@@ -162,7 +182,8 @@
 <script>
     import { PrivateKey } from "bitsharesjs";
     import { Apis } from "bitsharesjs-ws";
-
+    import { chainList } from "../config/config.js";
+    console.log(chainList);
     export default {
         name: "Create",
         i18nOptions: { namespaces: "common" },
@@ -179,7 +200,9 @@
                 step: 1,
                 s1c: "",
                 includeOwner: 0,
-                errorMsg: ""
+                errorMsg: "",
+                selectedChain: 0,
+                chainList: chainList
             };
         },
         methods: {
@@ -214,21 +237,21 @@
             step3: async function() {
                 let apkey, mpkey, opkey;
                 if (this.$data.accountname == "") {
-                    this.$data.errorMsg = this.$t('missing_account_error',{'chain': 'BTS'});
+                    this.$data.errorMsg = this.$t('missing_account_error',{'chain': this.$data.selectedChain});
                     this.$refs.errorModal.show();
                     return;
                 }
                 try {
                     apkey = PrivateKey.fromWif(this.activepk)
                         .toPublicKey()
-                        .toString("BTS");
+                        .toString(this.$data.selectedChain);
                     mpkey = PrivateKey.fromWif(this.memopk)
                         .toPublicKey()
-                        .toString("BTS");
+                        .toString(this.$data.selectedChain);
                     if (this.$data.includeOwner == 1) {
                         opkey = PrivateKey.fromWif(this.ownerpk)
                             .toPublicKey()
-                            .toString("BTS");
+                            .toString(this.$data.selectedChain);
                     }
                 } catch (e) {
                     console.log("Invalid Private Key format.");
@@ -290,6 +313,7 @@
                         .dispatch("WalletStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
                             accountName: this.$data.accountname,
                             accountID: this.$data.accountID,
+                            chain: this.$data.selectedChain,
                             keys: {
                                 active: this.activepk,
                                 owner: this.ownerpk,
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index e815108e..1cf3eb54 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -192,7 +192,7 @@
                 let entity = "";
                 let objdata = await Apis.instance()
                     .db_api()
-                    .exec("get_objects", [[this.$data.incoming.id]]);
+                    .exec("get_objects", [[this.$data.incoming.params.id]]);
 
                 let objextradata;
                 switch (entity_id[1]) {
@@ -306,8 +306,8 @@
                         this.$store.state.WalletStore.wallet.keys.active
                     );
                     tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
-                    let id = await tr.broadcast();
-                    this.$data.incoming.acceptgen({ id: id });
+                    let resp = await tr.broadcast();
+                    this.$data.incoming.acceptgen(resp);
                     this.$refs.genericReqModal.hide();
                     this.$refs.loaderAnimModal.hide();
                 });
diff --git a/src/components/popups.vue b/src/components/popups.vue
index 813578f5..af582296 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -1,32 +1,78 @@
 <template>
-    <b-modal
-        id="linkRequest"
-        ref="linkReqModal"
-        centered
-        no-close-on-esc
-        no-close-on-backdrop
-        hide-header-close
-        hide-footer
-        :title="$t('link_request')"
-    >
-        {{ this.$data.genericmsg }}:
-        <br>
-        <br>        
-    </b-modal>
+    <div>
+        <b-modal
+            id="linkRequest"
+            ref="linkReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            :title="$t('link_request')"
+        >
+            {{ this.$data.genericmsg }}:
+            <br>
+            <br>        
+        </b-modal>
+        <div class="alerts">
+            <b-alert variant="warning" v-bind:key="alert.id" v-for="alert in alerts" show fade dismissible v-on:dismissed="hideAlert(alert.id)">{{alert.msg}}</b-alert>            
+        </div>
+    </div>
 </template>
-
+<style>
+    .alerts {
+        position:absolute;
+        left:5%;
+        right:5%;
+        top:2%;
+        width:90%;
+    }
+</style>
 <script>
+import {
+    v4 as uuidv4
+} from "uuid";
+
     export default {
         name: "Popups",
         i18nOptions: { namespaces: "common" },        
         data() {
             return {
-                genericmsg: ''
+                genericmsg: '',
+                alerts: []
             };
-        },        
+        },  
+        watch:{
+            $route (to, from){
+                this.alerts = [];
+            }
+        },      
         methods: {
             link: async function() {
                 await this.$refs.linkReqModal.show();
+            },
+            showAlert: function(request) { 
+                let alert;
+                let alertmsg; 
+                switch(request.type) {
+                    case 'link':
+                        alertmsg=this.$t('link_alert',request);
+                        alert={msg:alertmsg, id: uuidv4()};
+                        break;
+                    default:
+                        console.log(request.payload);
+                        alertmsg=this.$t('access_alert',request.payload);
+                        alert={msg:alertmsg, id: uuidv4()};
+                        break;
+                }
+                //let alert={msg:msg, id: uuidv4()};
+                this.alerts.push(alert);
+            },
+            hideAlert: function(id) {
+                let index = this.alerts.findIndex(function(o){
+                    return o.id === id;
+                })
+                if (index !== -1) this.alerts.splice(index, 1);
             }
         }
     };
diff --git a/src/components/start.vue b/src/components/start.vue
index 226d1052..dcfbd1b5 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -28,7 +28,7 @@
                     v-for="wallet in walletlist"
                     :key="wallet.id"
                     :value="wallet.id"
-                >{{ wallet.name }}</option>
+                >{{ wallet.name }} ({{ wallet.chain }})</option>
             </select>
             <input
                 v-if="hasWallet"
diff --git a/src/config/config.js b/src/config/config.js
index 6057558a..d555fef6 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,4 +1,7 @@
 export const version ={release: 1, name:'1.0.0beta'};
+export const chainList=[
+    { short: 'BTS', name: 'BitShares'}
+];
 export const nodeList = [
 
     {
diff --git a/src/index.js b/src/index.js
index 2678402e..94117a51 100644
--- a/src/index.js
+++ b/src/index.js
@@ -17,7 +17,7 @@ let mainWindow;
 const isDevMode = process.execPath.match(/[\\/]electron/);
 
 if (isDevMode) enableLiveReload();
-
+let first=true;
 let tray = null;
 let minimised = false;
 const createWindow = async () => {
@@ -49,7 +49,7 @@ const createWindow = async () => {
       }
     }
   ]);
-  tray.setToolTip('BitShares Companion')
+  tray.setToolTip('Beet')
   tray.setContextMenu(contextMenu)
   // Open the DevTools.
   if (isDevMode) {
@@ -68,11 +68,14 @@ const createWindow = async () => {
 
   mainWindow.on('minimize', function (event) {
     event.preventDefault();
-    tray.displayBalloon({
-      icon: __dirname + '/img/bitshares.png',
-      title: "BitShares Companion is minimised.",
-      content: "It will run in the background until you quit."
-    });
+    if (first) {
+      tray.displayBalloon({
+        icon: __dirname + '/img/bitshares.png',
+        title: "Beet is minimised.",
+        content: "It will run in the background until you quit."
+      });
+      first=false;
+    } 
     minimised = true;
     mainWindow.hide();
   });
@@ -85,11 +88,16 @@ const createWindow = async () => {
   mainWindow.on('close', function (event) {
     if (!app.isQuiting) {
       event.preventDefault();
+      
+    if (first) {
       tray.displayBalloon({
         icon: __dirname + '/img/bitshares.png',
-        title: "BitShares Companion is minimised.",
+        title: "Beet is minimised.",
         content: "It will run in the background until you quit."
       });
+      first=false;
+    } 
+      
       minimised = true;
       mainWindow.hide();
     }
@@ -100,12 +108,13 @@ const createWindow = async () => {
     if (minimised) {
       tray.displayBalloon({
         icon: __dirname + '/img/bitshares.png',
-        title: "BitShares Companion has a new request.",
+        title: "Beet has received a new request.",
         content: "Click here to view"
       });
     }
   });
   tray.on('click', (event) => {
+    
     mainWindow.setAlwaysOnTop(true);
     mainWindow.show();
     mainWindow.focus();
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 892717b4..8d86a361 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -1,7 +1,6 @@
 import * as Actions from './Actions';
 import Queue from './Queue';
 import store from '../store/index.js';
-
 var popupQ = new Queue();
 export default class BeetAPI {
 
@@ -19,6 +18,11 @@ export default class BeetAPI {
                 resolve: qresolve
             });
             console.log('waiting');
+            console.log(store.state.WalletStore);
+            if (store.state.WalletStore.isUnlocked==false) {
+                
+                vueInst.$children[2].showAlert(request);
+            }
             let unlocked=await store.state.WalletStore.unlocked.promise;
             result = await this[request.type](request, vueInst.$children[2]);
             let finished = popupQ.dequeue();
@@ -43,6 +47,11 @@ export default class BeetAPI {
                 resolve: qresolve
             });
             console.log('waiting2');
+            if (store.state.WalletStore.isUnlocked==false) {
+                //console.log(vueInst.$children);
+                vueInst.$children[2].showAlert('Please unlock');
+            }
+            
             await previous.promise;
             
             console.log('waiting done');
@@ -75,7 +84,7 @@ export default class BeetAPI {
             let response = await vue.requestAccess(request);
             console.log({
                 id: request.id,
-                result: response
+                result: response 
             });
             return Object.assign(request, { identity: response});
         } catch (e) {
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 53cd1728..08195a32 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -62,6 +62,8 @@ const linkHandler = async (req) => {
         let response = Object.assign(req, {
             isLinked: true,
             apphash: apphash,
+            chain: req.payload.chain,
+            next_hash: req.payload.next_hash,
             account_id: userResponse.identity.id,
             secret: secret.toString('hex')
         });
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index 99cda0f1..c83e39d3 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -55,78 +55,82 @@ export default class BeetWS extends EventEmitter {
   }
   _handleMessage(client, data) {
  
-    if (data.type == 'version') {
-      client.send('{ "id": "' + data.id + '", "error": false, "payload": { "version": "' + JSON.stringify(version) + '"}}');
-    }
-    if (client.isAuthenticated) {
-      if (client.isLinked) {
-        if (data.type == 'api') {
-          let hash =  CryptoJS.SHA256(''+data.id).toString();
-          console.log(hash);
-          console.log(client.next_hash);
-          if (hash == client.next_hash) {
-            client.otp.counter = data.id;
-            var key = client.otp.generate();
-            try {
-              var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
+    if (data.type == 'version') { 
+      client.send('{ "type": "version", "error": false, "result": { "version": ' + JSON.stringify(version) + '}}');
+    }else{
+      if (client.isAuthenticated) {
+        if (client.isLinked) {
+          if (data.type == 'api') {
+            let hash =  CryptoJS.SHA256(''+data.id).toString();
+            console.log(hash);
+            console.log(client.next_hash);
+            if (hash == client.next_hash) {
+              client.otp.counter = data.id;
+              var key = client.otp.generate();
+              try {
+                var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
 
-              msg.origin=client.origin;
-              msg.appName=client.appName;
-              msg.apphash=client.apphash;
-              msg.chain=client.chain;
-              msg.account_id=client.account_id;
-              client.next_hash = msg.next_hash;
-              this.emit('api', {
-                "client": client.id,
-                "id": data.id,
-                "type":msg.method,
-                "payload": msg
-              });
-            } catch (e) {
-              console.log (e);
-              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Could not decrypt message"}}');
+                msg.origin=client.origin;
+                msg.appName=client.appName;
+                msg.apphash=client.apphash;
+                msg.chain=client.chain;
+                msg.account_id=client.account_id;
+                client.next_hash = msg.next_hash;
+                this.emit('api', {
+                  "client": client.id,
+                  "id": data.id,
+                  "type":msg.method,
+                  "payload": msg
+                });
+              } catch (e) {
+                console.log (e);
+                client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, message": "Could not decrypt message"}}');
+              }
+            } else {
+              client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":2,"message": "Unexpected request id. Please relink"}}');
             }
           } else {
-            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Unexpected request id. Please relink"}}');
+            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":1, "message": "Beet could not understand your request"}}');
           }
         } else {
-          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Beet could not understand your request"}}');
+          if (data.type == 'link') {
+            console.log(client);
+            let linkobj= {
+              "id": data.id,
+              "client": client.id,
+              "payload": data.payload,
+              "chain": data.payload.chain,
+              "origin": client.origin,
+              "appName": client.appName,
+              "browser":client.browser,
+              "key":client.pk,
+              "type": 'link'
+            };
+            console.log('Link:');
+            console.log(linkobj);
+            this.emit('link',linkobj);
+          } else {
+            client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":4, "message": "This app is not yet linked"}}');
+          }
         }
       } else {
-        if (data.type == 'link') {
-          console.log(client);
-          let linkobj= {
+        if (data.type == 'authenticate') {
+          this.emit('authenticate', {
             "id": data.id,
             "client": client.id,
-            "payload": data.payload,
-            "origin": client.origin,
-            "appName": client.appName,
-            "browser":client.browser,
-            "key":client.pk,
-            "type": 'link'
-          };
-
-          this.emit('link',linkobj);
+            "payload": data.payload
+          });
         } else {
-          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "This app is not yet linked"}}');
+          client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":5, "message": "Must authenticate first"}}');
         }
       }
-    } else {
-      if (data.type == 'authenticate') {
-        this.emit('authenticate', {
-          "id": data.id,
-          "client": client.id,
-          "payload": data.payload
-        });
-      } else {
-        client.send('{ "id": "' + data.id + '", "error": true, "payload": { "message": "Must authenticate first"}}');
-      }
     }
   }
   async respondLink(client, result) {    
     if (result.isLinked == true) {
       this._clients[client].isLinked = true;
       this._clients[client].apphash = result.apphash;
+      this._clients[client].account_id = result.account_id;
       this._clients[client].chain = result.chain;
       this._clients[client].next_hash = result.next_hash;
       let otp = new OTPAuth.HOTP({
@@ -140,7 +144,7 @@ export default class BeetWS extends EventEmitter {
       this._clients[client].otp = otp;
       this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.account_id + '"}}');
     } else {
-      this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "message": "Could not link to Beet"}}');
+      this._clients[client].send('{ "id": "' + result.id + '", "error": true, "payload": { "code":6, "message": "Could not link to Beet"}}');
     }
   }
   respondAPI(client, response) {
@@ -179,7 +183,7 @@ export default class BeetWS extends EventEmitter {
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
       }
     } else {
-      this._clients[client].send('{"id": ' + result.id + ', "error": true, "payload": { "message": "Could not authenticate"}}');
+      this._clients[client].send('{"id": ' + result.id + ', "error": true, "payload": { "code":7, "message": "Could not authenticate"}}');
     }
   }
   _handleConnection(client) {
diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index 27f1960e..ad43d1fe 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -25,6 +25,7 @@ const mutations = {
     },
     [CONFIRM_UNLOCK](state) {
         state.unlocked.resolve();
+        Vue.set(state, 'isUnlocked', true);
     },
     [SET_WALLET_STATUS](state, status) {
 
@@ -79,7 +80,9 @@ const actions = {
                 let walletid = uuid();
                 let newwallet = {
                     id: walletid,
-                    name: payload.walletname
+                    name: payload.walletname,
+                    chain: payload.walletdata.chain, 
+                    accounts: [payload.walletdata.accountID]
                 };
                 if (!wallets) {
                     wallets = [];
@@ -156,7 +159,8 @@ const initialState = {
     hasWallet: false,
     walletlist: [],
     ipc: ipcRenderer,
-    unlocked: {}
+    unlocked: {},
+    isUnlocked:false
 };
 
 export default {
diff --git a/src/translations/common/en.json b/src/translations/common/en.json
index f9f9c4a3..e27076db 100644
--- a/src/translations/common/en.json
+++ b/src/translations/common/en.json
@@ -10,7 +10,10 @@
     "create_cta": "Create a new Wallet",
     "step_counter": "Step {{step_no}}",
     "friendly_cta": "Set a friendly name for your new wallet:",
+    "chain_cta": "Select the blockhain for this wallet:",
     "walletname_placeholder": "Wallet Name",
+    "chain_placeholder": "Chain Name",
+    "select_chain": "Select Chain:",
     "cancel_btn": "Cancel",
     "next_btn": "Next",
     "back_btn": "Back",
@@ -20,6 +23,7 @@
     "owner_authority": "Owner Authority",
     "memo_authority": "Memo Authority",
     "active_authority_placeholder": "Active Private Key",
+    "owner_authority_placeholder": "Owner Private Key",
     "memo_authority_placeholder": "Memo Private Key",
     "include_owner_check": "Include Owner Key?",
     "password_cta": "Set a password for this wallet:",
@@ -33,5 +37,7 @@
     "confirm_pass_error": "Passwords do not match.",
     "balances_lbl": "Balances",
     "error_lbl": "Error",
-    "node_lbl": "Node:"
+    "node_lbl": "Node:",    
+    "link_alert": "App: `{{appName}}` from `{{origin}}` wants to link to a {{chain}} chain. Please create or unlock the appropriate wallet.",
+    "access_alert": "App: `{{appName}}` from `{{origin}}` wants to interact with linked account {{chain}}:{{account_id}}. Please create or unlock the appropriate wallet."
 }
\ No newline at end of file

From 052861088e882cb110ba3a5ac6b9dd89a271b1a8 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 28 Oct 2018 08:04:03 +0200
Subject: [PATCH 29/35] PR Review fixes & more

---
 src/components/balances.vue      |  20 +-
 src/components/create.vue        |  56 +++---
 src/components/dashboard.vue     | 300 +----------------------------
 src/components/popups.vue        | 316 ++++++++++++++++++++++++++++++-
 src/components/start.vue         |   8 +-
 src/config/config.js             |   2 +-
 src/index.html                   |   2 +-
 src/index.js                     |   8 +
 src/lib/BeetAPI.js               |   8 +-
 src/lib/BeetServer.js            |   1 -
 src/lib/event-bus.js             |   2 +
 src/store/modules/WalletStore.js |   2 +-
 12 files changed, 381 insertions(+), 344 deletions(-)
 create mode 100644 src/lib/event-bus.js

diff --git a/src/components/balances.vue b/src/components/balances.vue
index 22f0f436..d10c7185 100644
--- a/src/components/balances.vue
+++ b/src/components/balances.vue
@@ -36,7 +36,7 @@
                         false
                     ])
                     .then(res => {
-                        this.$data.rawbalances = res[0][1].balances;
+                        this.rawbalances = res[0][1].balances;
                         let neededassets = [];
                         for (var i = 0; i < res[0][1].balances.length; i++) {
                             neededassets.push(res[0][1].balances[i].asset_type);
@@ -45,23 +45,23 @@
                             .db_api()
                             .exec("get_objects", [neededassets]);
                     });
-                this.$data.balances = [];
-                for (var i = 0; i < this.$data.rawbalances.length; i++) {
+                this.balances = [];
+                for (var i = 0; i < this.rawbalances.length; i++) {
                     if (result[i].issuer == "1.2.0") {
-                        this.$data.balances[i] = {
-                            asset_type: this.$data.rawbalances[i].asset_type,
+                        this.balances[i] = {
+                            asset_type: this.rawbalances[i].asset_type,
                             asset_name: result[i].symbol,
-                            balance: this.$data.rawbalances[i].balance,
+                            balance: this.rawbalances[i].balance,
                             owner: result[i].issuer,
                             prefix: "BIT"
                         };
                     } else {
-                        this.$data.balances[i] = {
-                            asset_type: this.$data.rawbalances[i].asset_type,
+                        this.balances[i] = {
+                            asset_type: this.rawbalances[i].asset_type,
                             asset_name: result[i].symbol,
-                            rawbalance: this.$data.rawbalances[i].balance,
+                            rawbalance: this.rawbalances[i].balance,
                             balance: this.formatMoney(
-                                this.$data.rawbalances[i].balance /
+                                this.rawbalances[i].balance /
                                     Math.pow(10, result[i].precision),
                                 result[i].precision
                             ),
diff --git a/src/components/create.vue b/src/components/create.vue
index 8733ad50..a3ee8a87 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -207,55 +207,55 @@
         },
         methods: {
             step1: function() {
-                this.$data.step = 1;
+                this.step = 1;
             },
             step2: function() {
-                if (this.$data.walletname.trim() == "") {
+                if (this.walletname.trim() == "") {
                     console.log("Cannot create a wallet with an empty name.");
-                    this.$data.errorMsg = this.$t('empty_wallet_error');
+                    this.errorMsg = this.$t('empty_wallet_error');
                     this.$refs.errorModal.show();
-                    this.$data.s1c = "is-invalid";
+                    this.s1c = "is-invalid";
                 } else {
                     let wallets = JSON.parse(localStorage.getItem("wallets"));
 
                     if (
                         wallets &&
-                        wallets.filter(wallet => wallet.name === this.$data.walletname.trim())
+                        wallets.filter(wallet => wallet.name === this.walletname.trim())
                         .length > 0
                     ) {
                         console.log("A wallet with this name already exists.");
 
-                        this.$data.errorMsg = this.$t('duplicate_wallet_error');
+                        this.errorMsg = this.$t('duplicate_wallet_error');
                         this.$refs.errorModal.show();
-                        this.$data.s1c = "is-invalid";
+                        this.s1c = "is-invalid";
                     } else {
-                        this.$data.walletname = this.$data.walletname.trim();
-                        this.$data.step = 2;
+                        this.walletname = this.walletname.trim();
+                        this.step = 2;
                     }
                 }
             },
             step3: async function() {
                 let apkey, mpkey, opkey;
-                if (this.$data.accountname == "") {
-                    this.$data.errorMsg = this.$t('missing_account_error',{'chain': this.$data.selectedChain});
+                if (this.accountname == "") {
+                    this.errorMsg = this.$t('missing_account_error',{'chain': this.selectedChain});
                     this.$refs.errorModal.show();
                     return;
                 }
                 try {
                     apkey = PrivateKey.fromWif(this.activepk)
                         .toPublicKey()
-                        .toString(this.$data.selectedChain);
+                        .toString(this.selectedChain);
                     mpkey = PrivateKey.fromWif(this.memopk)
                         .toPublicKey()
-                        .toString(this.$data.selectedChain);
-                    if (this.$data.includeOwner == 1) {
+                        .toString(this.selectedChain);
+                    if (this.includeOwner == 1) {
                         opkey = PrivateKey.fromWif(this.ownerpk)
                             .toPublicKey()
-                            .toString(this.$data.selectedChain);
+                            .toString(this.selectedChain);
                     }
                 } catch (e) {
                     console.log("Invalid Private Key format.");
-                    this.$data.errorMsg = this.$t('invalid_key_error');
+                    this.errorMsg = this.$t('invalid_key_error');
                     this.$refs.errorModal.show();
                     return;
                 }
@@ -272,7 +272,7 @@
                             if (
                                 res[0][1].account.active.key_auths[0][0] == apkey &&
                                 (res[0][1].account.owner.key_auths[0][0] == opkey ||
-                                this.$data.includeOwner == 0) &&
+                                this.includeOwner == 0) &&
                                 res[0][1].account.options.memo_key == mpkey
                             ) {
                                 console.log(
@@ -284,36 +284,36 @@
                                 console.log("Keys not verified for provided account name.");
                                 this.$refs.loaderAnimModal.hide();
                                 this.$refs.errorModal.show();
-                                this.$data.errorMsg = this.$t('unverified_account_error');
+                                this.errorMsg = this.$t('unverified_account_error');
                                 return null;
                             }
                     });
                 });
                 if (verified != null) {
-                    this.$data.accountID = verified;
-                    this.$data.step = 3;
+                    this.accountID = verified;
+                    this.step = 3;
                 } else {
                     return;
                 }
             },
             verifyAndCreate: async function() {
                 if (
-                    this.$data.password != this.$data.confirmpassword ||
-                    this.$data.password == ""
+                    this.password != this.confirmpassword ||
+                    this.password == ""
                 ) {
                     this.$refs.errorModal.show();
-                    this.$data.errorMsg = this.$t('confirm_pass_error');
+                    this.errorMsg = this.$t('confirm_pass_error');
                     return;
                 }
 
                 this.$refs.loaderAnimModal.show();
 
-                if (this.$data.accountID !== null) {
+                if (this.accountID !== null) {
                     this.$store
-                        .dispatch("WalletStore/saveWallet", { walletname: this.$data.walletname, password: this.$data.password, walletdata:  {
-                            accountName: this.$data.accountname,
-                            accountID: this.$data.accountID,
-                            chain: this.$data.selectedChain,
+                        .dispatch("WalletStore/saveWallet", { walletname: this.walletname, password: this.password, walletdata:  {
+                            accountName: this.accountname,
+                            accountID: this.accountID,
+                            chain: this.selectedChain,
                             keys: {
                                 active: this.activepk,
                                 owner: this.ownerpk,
diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue
index 1cf3eb54..d82f8513 100644
--- a/src/components/dashboard.vue
+++ b/src/components/dashboard.vue
@@ -12,133 +12,23 @@
             ref="apinode"
             @first-connect="getBalances"
         />
-        <b-modal
-            id="accountRequest"
-            ref="accountReqModal"
-            centered
-            no-close-on-esc
-            no-close-on-backdrop
-            hide-header-close
-            hide-footer
-            :title="$t('operations:account_id.title')"
-        >
-            {{ $t('operations:account_id.request',{origin: this.$data.incoming.origin }) }}
-            <br>
-            <br>
-            {{ $t('operations:account_id.request_cta') }}
-            <b-btn
-                class="mt-3"
-                variant="success"
-                block
-                @click="allowAccess"
-            >{{ $t('operations:account_id.accept_btn') }}</b-btn>
-            <b-btn
-                class="mt-1"
-                variant="danger"
-                block
-                @click="denyAccess"
-            >{{ $t('operations:account_id.reject_btn') }}</b-btn>
-        </b-modal>
-        <b-modal
-            id="transactionRequest"
-            ref="transactionReqModal"
-            centered
-            no-close-on-esc
-            no-close-on-backdrop
-            hide-header-close
-            hide-footer
-            :title="$t('operations:rawsig.title')"
-        >
-            {{ $t('operations:rawsig.request',{origin: this.$data.incoming.origin }) }}
-            <br>
-            <br>
-            <pre class="text-left custom-content"><code>
-{
-  op_type: {{ this.$data.incoming.op_type }},
-  op_data: {{ this.$data.incoming.op_data }}
-}
-            </code></pre>
-            
-            {{ $t('operations:rawsig.request_cta') }}
-            <b-btn
-                class="mt-3"
-                variant="success"
-                block
-                @click="acceptTx"
-            >
-                {{ $t('operations:rawsig.accept_btn') }}</b-btn>
-            <b-btn
-                class="mt-1"
-                variant="danger"
-                block
-                @click="rejectTx"
-            >
-                {{ $t('operations:rawsig.reject_btn') }}</b-btn>
-        </b-modal>
-        <b-modal
-            id="genericRequest"
-            ref="genericReqModal"
-            centered
-            no-close-on-esc
-            no-close-on-backdrop
-            hide-header-close
-            hide-footer
-            :title="this.$data.generictitle "
-        >
-            {{ this.$data.genericmsg }}:
-            <br>
-            <br>
-            <pre class="text-left custom-content"><code>
-{{ this.$data.specifics }}
-            </code></pre>
-            <b-btn
-                class="mt-3"
-                variant="success"
-                block
-                @click="acceptGeneric"
-            >{{ this.$data.genericaccept }}</b-btn>
-            <b-btn
-                class="mt-1"
-                variant="danger"
-                block
-                @click="rejectGeneric"
-            >{{ this.$data.genericreject }}</b-btn>
-        </b-modal>
-        <b-modal
-            id="loaderAnim"
-            ref="loaderAnimModal"
-            centered
-            no-close-on-esc
-            no-close-on-backdrop
-            hide-header
-            hide-header-close
-            hide-footer
-        >
-            <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
-        </b-modal>
     </div>
 
 </template>
 
 <script>
-    import Operations from "../lib/Operations";
     import NodeSelect from "./node-select";
     import Balances from "./balances";
-    import { Apis } from "bitsharesjs-ws";
-    import {
-        PrivateKey,
-        TransactionBuilder
-    } from "bitsharesjs";
+    import { EventBus } from '../lib/event-bus.js';
 
     export default {
         name: "Dashboard",
-        i18nOptions: { namespaces: ["common", "operations"] },
+        i18nOptions: { namespaces: ["common"] },
         components: { NodeSelect, Balances },
         data() {
             return {
-                text: "",
-                api: {},
-                incoming: "",
+                api: null,
+                incoming: null,
                 genericmsg: "",
                 specifics: ""
             };
@@ -152,188 +42,16 @@
             }
         },
         mounted() {
-            this.$refs.loaderAnimModal.show();
+            EventBus.$emit('popup', 'load-start');
+            //this.$refs.loaderAnimModal.show();
         },
         methods: {
             getBalances: async function() {
                 await this.$refs.balancetable.getBalances();
                 this.$store.dispatch("WalletStore/confirmUnlock");
-                this.$refs.loaderAnimModal.hide();
-            },
-            requestAccess: function(request) {
-                
-                this.$store.dispatch("WalletStore/notifyUser", {
-                    notify: "request"
-                });
-                this.$data.incoming = {};
-                this.$data.incoming = request;
-                this.$refs.accountReqModal.show();
-                return new Promise((res, rej) => {
-                    this.$data.incoming.accept = res;
-                    this.$data.incoming.reject = rej;
-                });
-            },
-            requestVote: async function(request) {
-                this.$store.dispatch("WalletStore/notifyUser", {
-                    notify: "request"
-                });
-                this.$data.incoming = {};
-                this.$data.incoming = request;
-
-                this.$data.incoming.action = "vote";
-                let entity_id = this.$data.incoming.params.id.split(".");
-                if (entity_id[0] != "1") {
-                    return Promise.reject();
-                }
-                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
-                    return Promise.reject();
-                }
-
-                let entity = "";
-                let objdata = await Apis.instance()
-                    .db_api()
-                    .exec("get_objects", [[this.$data.incoming.params.id]]);
-
-                let objextradata;
-                switch (entity_id[1]) {
-                case "5":
-                    entity = "committee member";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].committee_member_account]]);
-                    this.$data.specifics =
-                        "Commitee member: " +
-                        objextradata[0].name +
-                        "\nCommittee Member ID: " +
-                        this.$data.incoming.params.id;
-                    this.$data.incoming.vote_id = objdata[0].vote_id;
-                    break;
-                case "6":
-                    entity = "witness";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].witness_account]]);
-                    this.$data.specifics =
-                        "Witness: " +
-                        objextradata[0].name +
-                        "\nWitness ID: " +
-                        this.$data.incoming.params.id;
-                    this.$data.incoming.vote_id = objdata[0].vote_id;
-                    break;
-                case "14":
-                    entity = "worker proposal";
-                    objextradata = await Apis.instance()
-                        .db_api()
-                        .exec("get_objects", [[objdata[0].worker_account]]);
-                    this.$data.specifics =
-                        "Proposal: " +
-                        objdata[0].name +
-                        "\nProposal ID: " +
-                        this.$data.incoming.params.id +
-                        "\nDaily Pay: " +
-                        this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
-                        "BTS\nWorker: " +
-                        objextradata[0].name;
-                    this.$data.incoming.vote_id = objdata[0].vote_for;
-                    break;
-                }
-                this.$data.genericmsg = this.$t('operations:vote.request', {origin: this.$data.incoming.origin, entity: entity });
-                this.$data.generictitle=this.$t('operations:vote.title');
-                this.$data.genericaccept=this.$t('operations:vote.accept_btn');
-                this.$data.genericreject=this.$t('operations:vote.reject_btn');
-                this.$refs.genericReqModal.show();
-                return new Promise((res, rej) => {
-                    this.$data.incoming.acceptgen = res;
-                    this.$data.incoming.rejectgen = rej;
-                });
-            },
-            requestTx: function(request) {
-                this.$root.$data.ipc.send("notify", "request");
-                this.$data.incoming = {};
-                this.$data.incoming = request;
-                this.$refs.transactionReqModal.show();
-                return new Promise((res, rej) => {
-                    this.$data.incoming.accepttx = res;
-                    this.$data.incoming.rejecttx = rej;
-                });
-            },
-            allowAccess: function() {
-                this.$refs.accountReqModal.hide();
-                this.$data.incoming.accept({
-                    account: this.$store.state.WalletStore.wallet.accountName,
-                    id: this.$store.state.WalletStore.wallet.accountID
-                });
-            },
-            denyAccess: function() {
-                this.$refs.accountReqModal.hide();
-                this.$data.incoming.reject({});
-            },
-            acceptTx: async function() {
-                let tr = new TransactionBuilder();
-                Apis.instance().init_promise.then(() => {
-                    tr.add_type_operation(
-                        this.$data.incoming.params.op_type,
-                        this.$data.incoming.params.op_data
-                    );
-                    tr.set_required_fees().then(async () => {
-                        this.$refs.loaderAnimModal.show();
-                        let pKey = PrivateKey.fromWif(
-                            this.$store.state.WalletStore.wallet.keys.active
-                        );
-                        tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
-                        let id = await tr.broadcast();
-                        this.$data.incoming.accepttx({ id: id });
-                        this.$refs.transactionReqModal.hide();
-                        this.$refs.loaderAnimModal.hide();
-                    });
-                });
-            },
-            rejectTx: function() {
-                this.$refs.transactionReqModal.hide();
-                this.$data.incoming.rejecttx({});
-            },
-            acceptGeneric: async function() {
-                let tr = new TransactionBuilder();
-                let operation = await Operations.generate(
-                    this.$data.incoming,
-                    this.$store.state.WalletStore.wallet.accountID
-                );
-
-                tr.add_type_operation(operation.op_type, operation.op_data);
-                tr.set_required_fees().then(async () => {
-                    this.$refs.loaderAnimModal.show();
-                    let pKey = PrivateKey.fromWif(
-                        this.$store.state.WalletStore.wallet.keys.active
-                    );
-                    tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
-                    let resp = await tr.broadcast();
-                    this.$data.incoming.acceptgen(resp);
-                    this.$refs.genericReqModal.hide();
-                    this.$refs.loaderAnimModal.hide();
-                });
-            },
-            rejectGeneric: function() {
-                this.$refs.genericReqModal.hide();
-                this.$data.incoming.rejectgen({});
-            },
-            formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
-                var c = isNaN(decimals) ? 2 : Math.abs(decimals),
-                    d = decimal_sep || ".",
-                    t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
-                    sign = n < 0 ? "-" : "",
-                    i = parseInt((n = Math.abs(n).toFixed(c))) + "",
-                    j = (j = i.length) > 3 ? j % 3 : 0;
-                return (
-                    sign +
-                    (j ? i.substr(0, j) + t : "") +
-                    i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
-                    (c
-                        ? d +
-                            Math.abs(n - i)
-                                .toFixed(c)
-                                .slice(2)
-                        : "")
-                );
+                EventBus.$emit('popup', 'load-end');
+                //this.$emit("load-end");
+                //this.$refs.loaderAnimModal.hide();
             }
         }
     };
diff --git a/src/components/popups.vue b/src/components/popups.vue
index af582296..4d9474d8 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -10,10 +10,115 @@
             hide-footer
             :title="$t('link_request')"
         >
-            {{ this.$data.genericmsg }}:
+            {{ this.genericmsg }}:
             <br>
             <br>        
         </b-modal>
+        
+        <b-modal
+            id="accountRequest"
+            ref="accountReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            :title="$t('operations:account_id.title')"
+        >
+            {{ $t('operations:account_id.request',{origin: this.incoming.origin }) }}
+            <br>
+            <br>
+            {{ $t('operations:account_id.request_cta') }}
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="allowAccess"
+            >{{ $t('operations:account_id.accept_btn') }}</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="denyAccess"
+            >{{ $t('operations:account_id.reject_btn') }}</b-btn>
+        </b-modal>
+        <b-modal
+            id="transactionRequest"
+            ref="transactionReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            :title="$t('operations:rawsig.title')"
+        >
+            {{ $t('operations:rawsig.request',{origin: this.incoming.origin }) }}
+            <br>
+            <br>
+            <pre class="text-left custom-content"><code>
+{
+  op_type: {{ this.incoming.op_type }},
+  op_data: {{ this.incoming.op_data }}
+}
+            </code></pre>
+            
+            {{ $t('operations:rawsig.request_cta') }}
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="acceptTx"
+            >
+                {{ $t('operations:rawsig.accept_btn') }}</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="rejectTx"
+            >
+                {{ $t('operations:rawsig.reject_btn') }}</b-btn>
+        </b-modal>
+        <b-modal
+            id="genericRequest"
+            ref="genericReqModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header-close
+            hide-footer
+            :title="this.generictitle "
+        >
+            {{ this.genericmsg }}:
+            <br>
+            <br>
+            <pre class="text-left custom-content"><code>
+{{ this.specifics }}
+            </code></pre>
+            <b-btn
+                class="mt-3"
+                variant="success"
+                block
+                @click="acceptGeneric"
+            >{{ this.genericaccept }}</b-btn>
+            <b-btn
+                class="mt-1"
+                variant="danger"
+                block
+                @click="rejectGeneric"
+            >{{ this.genericreject }}</b-btn>
+        </b-modal>
+        <b-modal
+            id="loaderAnim"
+            ref="loaderAnimModal"
+            centered
+            no-close-on-esc
+            no-close-on-backdrop
+            hide-header
+            hide-header-close
+            hide-footer
+        >
+            <div class="lds-roller"><div /><div /><div /><div /><div /><div /><div /><div /></div>
+        </b-modal>
         <div class="alerts">
             <b-alert variant="warning" v-bind:key="alert.id" v-for="alert in alerts" show fade dismissible v-on:dismissed="hideAlert(alert.id)">{{alert.msg}}</b-alert>            
         </div>
@@ -32,16 +137,38 @@
 import {
     v4 as uuidv4
 } from "uuid";
+import { EventBus } from '../lib/event-bus.js';
+import Operations from "../lib/Operations";
+import { Apis } from "bitsharesjs-ws";
+    import {
+        PrivateKey,
+        TransactionBuilder
+    } from "bitsharesjs";
 
     export default {
         name: "Popups",
-        i18nOptions: { namespaces: "common" },        
+        i18nOptions: { namespaces: ["common", "operations"] },
         data() {
             return {
                 genericmsg: '',
-                alerts: []
+                alerts: [],
+                api: null,
+                incoming: null,                
+                specifics: ""
             };
         },  
+        created() {
+            EventBus.$on('popup', what => {
+                switch(what) {
+                    case 'load-start':
+                        this.$refs.loaderAnimModal.show();
+                        break;
+                    case 'load-end':
+                        this.$refs.loaderAnimModal.hide();
+                        break;
+                }
+            });
+        },
         watch:{
             $route (to, from){
                 this.alerts = [];
@@ -58,10 +185,18 @@ import {
                     case 'link':
                         alertmsg=this.$t('link_alert',request);
                         alert={msg:alertmsg, id: uuidv4()};
+                        
+                        this.$store.dispatch("WalletStore/notifyUser", {
+                            notify: "request", message: alertmsg
+                        });                        
                         break;
                     default:
                         console.log(request.payload);
                         alertmsg=this.$t('access_alert',request.payload);
+                        
+                        this.$store.dispatch("WalletStore/notifyUser", {
+                            notify: "request", message: alertmsg
+                        });                        
                         alert={msg:alertmsg, id: uuidv4()};
                         break;
                 }
@@ -73,6 +208,181 @@ import {
                     return o.id === id;
                 })
                 if (index !== -1) this.alerts.splice(index, 1);
+            },
+            requestAccess: function(request) {
+                
+                this.$store.dispatch("WalletStore/notifyUser", {
+                    notify: "request", message: "request"
+                });
+                this.incoming = {};
+                this.incoming = request;
+                this.$refs.accountReqModal.show();
+                return new Promise((res, rej) => {
+                    this.incoming.accept = res;
+                    this.incoming.reject = rej;
+                });
+            },
+            requestVote: async function(request) {
+                this.$store.dispatch("WalletStore/notifyUser", {
+                    notify: "request", message: "request"
+                });
+                this.incoming = {};
+                this.incoming = request;
+
+                this.incoming.action = "vote";
+                let entity_id = this.incoming.params.id.split(".");
+                if (entity_id[0] != "1") {
+                    return Promise.reject();
+                }
+                if (entity_id[1] != "5" && entity_id[1] != "6" && entity_id[1] != "14") {
+                    return Promise.reject();
+                }
+
+                let entity = "";
+                let objdata = await Apis.instance()
+                    .db_api()
+                    .exec("get_objects", [[this.incoming.params.id]]);
+
+                let objextradata;
+                switch (entity_id[1]) {
+                case "5":
+                    entity = "committee member";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].committee_member_account]]);
+                    this.specifics =
+                        "Commitee member: " +
+                        objextradata[0].name +
+                        "\nCommittee Member ID: " +
+                        this.incoming.params.id;
+                    this.incoming.vote_id = objdata[0].vote_id;
+                    break;
+                case "6":
+                    entity = "witness";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].witness_account]]);
+                    this.specifics =
+                        "Witness: " +
+                        objextradata[0].name +
+                        "\nWitness ID: " +
+                        this.incoming.params.id;
+                    this.incoming.vote_id = objdata[0].vote_id;
+                    break;
+                case "14":
+                    entity = "worker proposal";
+                    objextradata = await Apis.instance()
+                        .db_api()
+                        .exec("get_objects", [[objdata[0].worker_account]]);
+                    this.specifics =
+                        "Proposal: " +
+                        objdata[0].name +
+                        "\nProposal ID: " +
+                        this.incoming.params.id +
+                        "\nDaily Pay: " +
+                        this.formatMoney(objdata[0].daily_pay / Math.pow(10, 5), 5) +
+                        "BTS\nWorker: " +
+                        objextradata[0].name;
+                    this.incoming.vote_id = objdata[0].vote_for;
+                    break;
+                }
+                this.genericmsg = this.$t('operations:vote.request', {origin: this.incoming.origin, entity: entity });
+                this.generictitle=this.$t('operations:vote.title');
+                this.genericaccept=this.$t('operations:vote.accept_btn');
+                this.genericreject=this.$t('operations:vote.reject_btn');
+                this.$refs.genericReqModal.show();
+                return new Promise((res, rej) => {
+                    this.incoming.acceptgen = res;
+                    this.incoming.rejectgen = rej;
+                });
+            },
+            requestTx: function(request) {
+                this.$root.$data.ipc.send("notify", "request");
+                this.incoming = {};
+                this.incoming = request;
+                this.$refs.transactionReqModal.show();
+                return new Promise((res, rej) => {
+                    this.incoming.accepttx = res;
+                    this.incoming.rejecttx = rej;
+                });
+            },
+            allowAccess: function() {
+                this.$refs.accountReqModal.hide();
+                this.incoming.accept({
+                    account: this.$store.state.WalletStore.wallet.accountName,
+                    id: this.$store.state.WalletStore.wallet.accountID
+                });
+            },
+            denyAccess: function() {
+                this.$refs.accountReqModal.hide();
+                this.incoming.reject({});
+            },
+            acceptTx: async function() {
+                let tr = new TransactionBuilder();
+                Apis.instance().init_promise.then(() => {
+                    tr.add_type_operation(
+                        this.incoming.params.op_type,
+                        this.incoming.params.op_data
+                    );
+                    tr.set_required_fees().then(async () => {
+                        this.$refs.loaderAnimModal.show();
+                        let pKey = PrivateKey.fromWif(
+                            this.$store.state.WalletStore.wallet.keys.active
+                        );
+                        tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+                        let id = await tr.broadcast();
+                        this.incoming.accepttx({ id: id });
+                        this.$refs.transactionReqModal.hide();
+                        this.$refs.loaderAnimModal.hide();
+                    });
+                });
+            },
+            rejectTx: function() {
+                this.$refs.transactionReqModal.hide();
+                this.incoming.rejecttx({});
+            },
+            acceptGeneric: async function() {
+                let tr = new TransactionBuilder();
+                let operation = await Operations.generate(
+                    this.incoming,
+                    this.$store.state.WalletStore.wallet.accountID
+                );
+
+                tr.add_type_operation(operation.op_type, operation.op_data);
+                tr.set_required_fees().then(async () => {
+                    this.$refs.loaderAnimModal.show();
+                    let pKey = PrivateKey.fromWif(
+                        this.$store.state.WalletStore.wallet.keys.active
+                    );
+                    tr.add_signer(pKey, pKey.toPublicKey().toPublicKeyString());
+                    let resp = await tr.broadcast();
+                    this.incoming.acceptgen(resp);
+                    this.$refs.genericReqModal.hide();
+                    this.$refs.loaderAnimModal.hide();
+                });
+            },
+            rejectGeneric: function() {
+                this.$refs.genericReqModal.hide();
+                this.incoming.rejectgen({});
+            },
+            formatMoney: function(n, decimals, decimal_sep, thousands_sep) {
+                var c = isNaN(decimals) ? 2 : Math.abs(decimals),
+                    d = decimal_sep || ".",
+                    t = typeof thousands_sep === "undefined" ? "," : thousands_sep,
+                    sign = n < 0 ? "-" : "",
+                    i = parseInt((n = Math.abs(n).toFixed(c))) + "",
+                    j = (j = i.length) > 3 ? j % 3 : 0;
+                return (
+                    sign +
+                    (j ? i.substr(0, j) + t : "") +
+                    i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
+                    (c
+                        ? d +
+                            Math.abs(n - i)
+                                .toFixed(c)
+                                .slice(2)
+                        : "")
+                );
             }
         }
     };
diff --git a/src/components/start.vue b/src/components/start.vue
index dcfbd1b5..1dc436cc 100644
--- a/src/components/start.vue
+++ b/src/components/start.vue
@@ -99,15 +99,15 @@
             unlockWallet() {
                 this.$store
                     .dispatch("WalletStore/getWallet", {
-                        wallet_id: this.$data.selectedWallet,
-                        wallet_pass: this.$data.walletpass
+                        wallet_id: this.selectedWallet,
+                        wallet_pass: this.walletpass
                     })
                     .then(() => {
                         this.$router.replace("/dashboard");
                     })
                     .catch(() => {
-                        this.$data.passincorrect = "is-invalid";
-                        this.$data.errorMsg = "Invalid Password.";
+                        this.passincorrect = "is-invalid";
+                        this.errorMsg = "Invalid Password.";
                         this.$refs.errorModal.show();
                 });
             }
diff --git a/src/config/config.js b/src/config/config.js
index d555fef6..ac6d0f61 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,6 +1,6 @@
 export const version ={release: 1, name:'1.0.0beta'};
 export const chainList=[
-    { short: 'BTS', name: 'BitShares'}
+    { short: 'BTS', name: 'BitShares', chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8'}
 ];
 export const nodeList = [
 
diff --git a/src/index.html b/src/index.html
index 417a78d9..e0ab003f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -16,7 +16,7 @@
     <div class="main" id="app">
         <router-view name="header"></router-view>
         <router-view></router-view>
-        <Popups></Popups>
+        <Popups ref="popupComp"></Popups>
     </div>
     <script>
         import Vue from 'vue/dist/vue.js';
diff --git a/src/index.js b/src/index.js
index 94117a51..a4057cae 100644
--- a/src/index.js
+++ b/src/index.js
@@ -106,11 +106,19 @@ const createWindow = async () => {
   });
   ipcMain.on('notify', (event, arg) => {
     if (minimised) {
+      if (arg=='request') {
       tray.displayBalloon({
         icon: __dirname + '/img/bitshares.png',
         title: "Beet has received a new request.",
         content: "Click here to view"
       });
+    }else{
+      tray.displayBalloon({
+        icon: __dirname + '/img/bitshares.png',
+        title: arg,
+        content: "Click here to view"
+      });
+    }
     }
   });
   tray.on('click', (event) => {
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 8d86a361..b52b25b5 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -21,10 +21,10 @@ export default class BeetAPI {
             console.log(store.state.WalletStore);
             if (store.state.WalletStore.isUnlocked==false) {
                 
-                vueInst.$children[2].showAlert(request);
+                vueInst.$refs.popupComp.showAlert(request);
             }
             let unlocked=await store.state.WalletStore.unlocked.promise;
-            result = await this[request.type](request, vueInst.$children[2]);
+            result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         } else {
@@ -49,13 +49,13 @@ export default class BeetAPI {
             console.log('waiting2');
             if (store.state.WalletStore.isUnlocked==false) {
                 //console.log(vueInst.$children);
-                vueInst.$children[2].showAlert('Please unlock');
+                vueInst.$refs.popupComp.showAlert('Please unlock');
             }
             
             await previous.promise;
             
             console.log('waiting done');
-            result = await this[request.type](request, vueInst.$children[2]);
+            result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
             finished.resolve(true);
         }
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 08195a32..3a2302bd 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -129,7 +129,6 @@ export default class BeetServer {
             server2.respondAuth(data.client, status);
         });
         server2.on('api', async (data) => {
-            console.log(data);
             store.dispatch('OriginStore/newRequest', {
                 apphash: data.payload.apphash,
                 next_hash: data.payload.next_hash
diff --git a/src/lib/event-bus.js b/src/lib/event-bus.js
new file mode 100644
index 00000000..01902424
--- /dev/null
+++ b/src/lib/event-bus.js
@@ -0,0 +1,2 @@
+import Vue from 'vue';
+export const EventBus = new Vue();
\ No newline at end of file
diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index ad43d1fe..e349c018 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -138,7 +138,7 @@ const actions = {
     }, payload) {
         return new Promise((resolve, reject) => {
             if (payload.notify == 'request') {
-                commit(REQ_NOTIFY, payload.notify);
+                commit(REQ_NOTIFY, payload.message);
                 resolve();
             } else {
                 reject();

From 639d6cad3a7ec56e6c27b99b467c635fe12bc253 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 28 Oct 2018 09:09:56 +0200
Subject: [PATCH 30/35] Added Custom logging to CLI

---
 .eslintrc.js                       |   3 +
 package-lock.json                  | 215 ++++++++++++++++++++++++++---
 package.json                       |   2 +
 src/components/create.vue          |  15 +-
 src/components/lang-select.vue     |   3 +-
 src/components/node-select.vue     |   9 +-
 src/components/popups.vue          |   7 +-
 src/index.html                     |   7 +
 src/index.js                       |   7 +
 src/lib/BeetAPI.js                 |  28 ++--
 src/lib/BeetServer.js              |  21 +--
 src/lib/BeetWS.js                  |  25 ++--
 src/lib/Logger.js                  |  82 +++++++++++
 src/lib/RendererLogger.js          |  59 ++++++++
 src/store/modules/OriginStore.js   |   5 +-
 src/store/modules/SettingsStore.js |   1 -
 src/store/modules/WalletStore.js   |   5 +-
 17 files changed, 429 insertions(+), 65 deletions(-)
 create mode 100644 src/lib/Logger.js
 create mode 100644 src/lib/RendererLogger.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 59db5bd9..7128e463 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,7 @@
 module.exports = {
+    "env": {
+        "node": true
+    },
     extends: [        
         "eslint:recommended",
         'plugin:vue/recommended'
diff --git a/package-lock.json b/package-lock.json
index 1da81fcb..97c9a242 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -131,6 +131,33 @@
         "vue-hot-reload-api": "^2.0.1",
         "vue-template-compiler": "^2.0.0-alpha.8",
         "vue-template-es2015-compiler": "^1.4.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
       }
     },
     "@types/node": {
@@ -264,9 +291,12 @@
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
     },
     "any-promise": {
       "version": "1.3.0",
@@ -642,6 +672,33 @@
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
       }
     },
     "babel-core": {
@@ -1848,15 +1905,13 @@
       }
     },
     "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "character-parser": {
@@ -1911,6 +1966,30 @@
       "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
       "requires": {
         "chalk": "^1.1.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
       }
     },
     "clean-css": {
@@ -5391,8 +5470,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-unicode": {
       "version": "2.0.1",
@@ -7187,6 +7265,23 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
         },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
         "inquirer": {
           "version": "3.0.6",
           "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
@@ -7253,6 +7348,11 @@
               }
             }
           }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
@@ -7619,6 +7719,30 @@
         "supports-color": "^3.2.3"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+            }
+          }
+        },
         "has-flag": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -8109,6 +8233,11 @@
         }
       }
     },
+    "readline": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
+      "integrity": "sha1-xYDXfvLPyHUrEySYBg3JeTp6wBw="
+    },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
@@ -9048,9 +9177,12 @@
       }
     },
     "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
     },
     "svgo": {
       "version": "0.7.2",
@@ -9227,6 +9359,12 @@
           "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
         "cli-cursor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
@@ -9290,6 +9428,21 @@
             "string-width": "^1.0.1",
             "strip-ansi": "^3.0.0",
             "through": "^2.3.6"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "1.1.3",
+              "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^2.2.1",
+                "escape-string-regexp": "^1.0.2",
+                "has-ansi": "^2.0.0",
+                "strip-ansi": "^3.0.0",
+                "supports-color": "^2.0.0"
+              }
+            }
           }
         },
         "minimist": {
@@ -9331,6 +9484,12 @@
             "onetime": "^1.0.0"
           }
         },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
         "tmp": {
           "version": "0.0.29",
           "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
@@ -9946,6 +10105,30 @@
         "vue-hot-reload-api": "^2.0.1",
         "vue-template-compiler": "^2.0.0-alpha.8",
         "vue-template-es2015-compiler": "^1.2.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
       }
     },
     "vuex": {
diff --git a/package.json b/package.json
index 6da6afc5..dd82e5ce 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@panter/vue-i18next": "^0.12.0",
     "bitsharesjs": "^1.8.0",
     "bootstrap-vue": "^2.0.0-rc.11",
+    "chalk": "^2.4.1",
     "crypto-js": "^3.1.9-1",
     "dexie": "^2.0.4",
     "eccrypto": "^1.0.3",
@@ -59,6 +60,7 @@
     "i18next": "^11.6.0",
     "i18next-node-fs-backend": "^2.0.0",
     "otpauth": "^3.2.1",
+    "readline": "^1.3.0",
     "secure-ls": "^1.2.1",
     "socket.io": "^2.1.1",
     "uuid": "^3.3.2",
diff --git a/src/components/create.vue b/src/components/create.vue
index a3ee8a87..121e045a 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -183,7 +183,10 @@
     import { PrivateKey } from "bitsharesjs";
     import { Apis } from "bitsharesjs-ws";
     import { chainList } from "../config/config.js";
-    console.log(chainList);
+    import RendererLogger from "../lib/RendererLogger";
+
+    const logger=new RendererLogger();
+    logger.log(chainList);
     export default {
         name: "Create",
         i18nOptions: { namespaces: "common" },
@@ -211,7 +214,7 @@
             },
             step2: function() {
                 if (this.walletname.trim() == "") {
-                    console.log("Cannot create a wallet with an empty name.");
+                    logger.log("Cannot create a wallet with an empty name.");
                     this.errorMsg = this.$t('empty_wallet_error');
                     this.$refs.errorModal.show();
                     this.s1c = "is-invalid";
@@ -223,7 +226,7 @@
                         wallets.filter(wallet => wallet.name === this.walletname.trim())
                         .length > 0
                     ) {
-                        console.log("A wallet with this name already exists.");
+                        logger.log("A wallet with this name already exists.");
 
                         this.errorMsg = this.$t('duplicate_wallet_error');
                         this.$refs.errorModal.show();
@@ -254,7 +257,7 @@
                             .toString(this.selectedChain);
                     }
                 } catch (e) {
-                    console.log("Invalid Private Key format.");
+                    logger.log("Invalid Private Key format.");
                     this.errorMsg = this.$t('invalid_key_error');
                     this.$refs.errorModal.show();
                     return;
@@ -275,13 +278,13 @@
                                 this.includeOwner == 0) &&
                                 res[0][1].account.options.memo_key == mpkey
                             ) {
-                                console.log(
+                                logger.log(
                                     "Keys verified. Account ID is: " + res[0][1].account.id
                                 );
                                 this.$refs.loaderAnimModal.hide();
                                 return res[0][1].account.id;
                             } else {
-                                console.log("Keys not verified for provided account name.");
+                                logger.log("Keys not verified for provided account name.");
                                 this.$refs.loaderAnimModal.hide();
                                 this.$refs.errorModal.show();
                                 this.errorMsg = this.$t('unverified_account_error');
diff --git a/src/components/lang-select.vue b/src/components/lang-select.vue
index e58cd511..82382245 100644
--- a/src/components/lang-select.vue
+++ b/src/components/lang-select.vue
@@ -44,8 +44,7 @@
             };
         },
         watch: {
-            selectLang: function() {
-                console.log("Switching Lang.");
+            selectLang: function() {                
                 this.$store.dispatch("SettingsStore/setLocale", { 'locale': this.selectLang });
                 i18next.changeLanguage(this.selectLang.iso);
             }
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index 0d866c42..af6ca94f 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -30,6 +30,9 @@
 <script>
     import { Apis } from "bitsharesjs-ws";
     import { nodeList } from "../config/config";
+    import RendererLogger from "../lib/RendererLogger";
+
+    const logger=new RendererLogger();
 
     export default {
         name: "NodeSelect",
@@ -44,9 +47,9 @@
         },
         watch: {
             selectedNode: function() {
-                console.log("Switching Node.");
+                logger.log("Switching Node.");
                 Apis.close().then(() => {
-                    console.log("Closed Node.");
+                    logger.log("Closed Node.");
                     this.isConnected = false;
                     Apis.instance(
                         this.selectedNode,
@@ -55,7 +58,7 @@
                         { enableCrypto: false, enableOrders: false },
                         this.onClose
                     ).init_promise.then(() => {
-                        console.log("Opened Node");
+                        logger.log("Opened Node");
                         this.$store.dispatch("SettingsStore/setNode", {
                             node: this.selectedNode
                         });
diff --git a/src/components/popups.vue b/src/components/popups.vue
index 4d9474d8..94121d06 100644
--- a/src/components/popups.vue
+++ b/src/components/popups.vue
@@ -153,7 +153,7 @@ import { Apis } from "bitsharesjs-ws";
                 genericmsg: '',
                 alerts: [],
                 api: null,
-                incoming: null,                
+                incoming: {},                
                 specifics: ""
             };
         },  
@@ -191,7 +191,6 @@ import { Apis } from "bitsharesjs-ws";
                         });                        
                         break;
                     default:
-                        console.log(request.payload);
                         alertmsg=this.$t('access_alert',request.payload);
                         
                         this.$store.dispatch("WalletStore/notifyUser", {
@@ -297,7 +296,9 @@ import { Apis } from "bitsharesjs-ws";
                 });
             },
             requestTx: function(request) {
-                this.$root.$data.ipc.send("notify", "request");
+                this.$store.dispatch("WalletStore/notifyUser", {
+                    notify: "request", message: "request"
+                });
                 this.incoming = {};
                 this.incoming = request;
                 this.$refs.transactionReqModal.show();
diff --git a/src/index.html b/src/index.html
index e0ab003f..aef7e657 100644
--- a/src/index.html
+++ b/src/index.html
@@ -29,6 +29,7 @@
         import Backend from "i18next-node-fs-backend";
         import VueI18Next from '@panter/vue-i18next';
         import BeetServer from "./lib/BeetServer";
+        import RendererLogger from "./lib/RendererLogger";
         
 
         
@@ -36,6 +37,7 @@
         Vue.use(BootstrapVue);
         Vue.use(VueRouter);
         Vue.component('Popups',Popups);
+        const logger=new RendererLogger;
         store.dispatch("SettingsStore/loadSettings");
         store.dispatch("OriginStore/loadApps");
         i18next.use(Backend).init({
@@ -55,6 +57,11 @@
         
         BeetServer.initialize(app);
         BeetServer.open();
+        
+        window.onerror = function (msg, url, lineNo, columnNo, error) {
+            logger.error(error);
+            return false;
+        }
     </script>
 </body>
 
diff --git a/src/index.js b/src/index.js
index a4057cae..67cd558b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,12 +9,14 @@ import installExtension from 'electron-devtools-installer';
 import {
   enableLiveReload
 } from 'electron-compile';
+import Logger from './lib/Logger';
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
 
 const isDevMode = process.execPath.match(/[\\/]electron/);
+const logger=new Logger(3);
 
 if (isDevMode) enableLiveReload();
 let first=true;
@@ -121,6 +123,11 @@ const createWindow = async () => {
     }
     }
   });
+  
+  ipcMain.on('log', (event, arg) => {
+    
+    logger[arg.level](arg.data);
+  });
   tray.on('click', (event) => {
     
     mainWindow.setAlwaysOnTop(true);
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index b52b25b5..926c4255 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -1,11 +1,15 @@
 import * as Actions from './Actions';
 import Queue from './Queue';
 import store from '../store/index.js';
+import RendererLogger from "./RendererLogger";
+
+const logger=new RendererLogger();
+
 var popupQ = new Queue();
 export default class BeetAPI {
 
     static async handler(request, vueInst) {        
-        console.log(request);
+        logger.log(request);
         if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
         let result;
         if (popupQ.isEmpty()) {
@@ -17,8 +21,8 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            console.log('waiting');
-            console.log(store.state.WalletStore);
+            logger.log('waiting');
+            logger.log(store.state.WalletStore);
             if (store.state.WalletStore.isUnlocked==false) {
                 
                 vueInst.$refs.popupComp.showAlert(request);
@@ -46,15 +50,15 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            console.log('waiting2');
+            logger.log('waiting2');
             if (store.state.WalletStore.isUnlocked==false) {
-                //console.log(vueInst.$children);
+                //logger.log(vueInst.$children);
                 vueInst.$refs.popupComp.showAlert('Please unlock');
             }
             
             await previous.promise;
             
-            console.log('waiting done');
+            logger.log('waiting done');
             result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
             finished.resolve(true);
@@ -65,30 +69,30 @@ export default class BeetAPI {
     static async [Actions.GET_ACCOUNT](request, vue) {
         try {
             
-            console.log(vue);
+            logger.log(vue);
             let response = await vue.requestAccess(request.payload);
-            console.log(response);
+            logger.log(response);
             return {
                 id: request.id,
                 result: response
             };
         } catch (e) {
-            console.log(e);
+            logger.log(e);
             return e;
         }
     }
     static async [Actions.REQUEST_LINK](request, vue) {
         try {
             
-            console.log(vue);
+            logger.log(vue);
             let response = await vue.requestAccess(request);
-            console.log({
+            logger.log({
                 id: request.id,
                 result: response 
             });
             return Object.assign(request, { identity: response});
         } catch (e) {
-            console.log(e);
+            logger.log(e);
             return { id: request.id, response: { isLinked: false }};
         }
     }
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 3a2302bd..11569d91 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -3,6 +3,9 @@ import BeetWS from './BeetWS';
 import CryptoJS from 'crypto-js';
 import store from '../store/index.js';
 import eccrypto from 'eccrypto';
+import RendererLogger from "./RendererLogger";
+
+const logger=new RendererLogger();
 
 let io = null;
 let vueInst = null;
@@ -44,11 +47,11 @@ const socketHandler = (socket) => {
 const linkHandler = async (req) => {
     let userResponse;
     try {
-        console.log(req);
+        logger.log(req);
         userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
-        console.log(userResponse);
+        logger.log(userResponse);
         let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
-        console.log(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
+        logger.log(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
         let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
         store.dispatch('OriginStore/addApp', {
             appName: req.appName,
@@ -69,7 +72,7 @@ const linkHandler = async (req) => {
         });
         return response;
     } catch (e) {
-        console.log(e);
+        logger.log(e);
     }
 };
 
@@ -85,8 +88,8 @@ const authHandler = async (req) => {
                 link: false
             });  
         }else{
-            console.log(req);
-            console.log(app);
+            logger.log(req);
+            logger.log(app);
             if (req.payload.origin==app.origin && req.payload.appName==app.appName)  {
                 return Object.assign(req.payload, {
                     authenticate: true,
@@ -116,11 +119,11 @@ export default class BeetServer {
         server.listen(60555, 'localhost');
         const server2 = new BeetWS(60556, 10000);
         io = window.require('socket.io').listen(server);
-        console.log('Beet listening...');
+        logger.log('Beet listening...');
         server2.on('link', async (data) => { 
             
             let status = await linkHandler(data);
-            console.log(status);
+            logger.log(status);
             server2.respondLink(data.client, status);
         });
         server2.on('authenticate', async (data) => {
@@ -134,7 +137,7 @@ export default class BeetServer {
                 next_hash: data.payload.next_hash
             });
             let status = await BeetAPI.handler(data, vueInst);
-            console.log(status);
+            logger.log(status);
             status.id = data.id;
             server2.respondAPI(data.client, status);
         });
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index c83e39d3..fd47d27c 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -12,6 +12,9 @@ import crypto from 'crypto';
 import eccrypto from 'eccrypto';
 import Https from 'https';
 import Fs from 'fs';
+import RendererLogger from "./RendererLogger";
+
+const logger=new RendererLogger();
 
 export default class BeetWS extends EventEmitter {
   constructor(port, timeout) {
@@ -30,11 +33,11 @@ export default class BeetWS extends EventEmitter {
       for (var clientid in self._clients) {
 
         let client = self._clients[clientid];
-        console.log(client);
+        logger.log(client);
         if (client.isAlive === false || client.readyState != 1) {
           self.emit("disconnected", client.id);
           delete(self._clients[client.id]);
-          console.log("Terminating client")
+          logger.log("Terminating client")
           return client.terminate();
         } else {
           client.isAlive = false;
@@ -42,7 +45,7 @@ export default class BeetWS extends EventEmitter {
         }
       }
     }, timeout);
-    console.log(self);
+    logger.log(self);
     server.on("connection", (client) => {
       self._handleConnection(client);
     });
@@ -62,8 +65,8 @@ export default class BeetWS extends EventEmitter {
         if (client.isLinked) {
           if (data.type == 'api') {
             let hash =  CryptoJS.SHA256(''+data.id).toString();
-            console.log(hash);
-            console.log(client.next_hash);
+            logger.log(hash);
+            logger.log(client.next_hash);
             if (hash == client.next_hash) {
               client.otp.counter = data.id;
               var key = client.otp.generate();
@@ -83,7 +86,7 @@ export default class BeetWS extends EventEmitter {
                   "payload": msg
                 });
               } catch (e) {
-                console.log (e);
+                logger.log (e);
                 client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, message": "Could not decrypt message"}}');
               }
             } else {
@@ -94,7 +97,7 @@ export default class BeetWS extends EventEmitter {
           }
         } else {
           if (data.type == 'link') {
-            console.log(client);
+            logger.log(client);
             let linkobj= {
               "id": data.id,
               "client": client.id,
@@ -106,8 +109,8 @@ export default class BeetWS extends EventEmitter {
               "key":client.pk,
               "type": 'link'
             };
-            console.log('Link:');
-            console.log(linkobj);
+            logger.log('Link:');
+            logger.log(linkobj);
             this.emit('link',linkobj);
           } else {
             client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":4, "message": "This app is not yet linked"}}');
@@ -156,7 +159,7 @@ export default class BeetWS extends EventEmitter {
   }
   respondAuth(client, result) {
     if (result.authenticate) {
-      console.log(result);
+      logger.log(result);
       this._clients[client].isAuthenticated = true;
       this._clients[client].origin = result.origin;
       this._clients[client].appName = result.appName;
@@ -194,7 +197,7 @@ export default class BeetWS extends EventEmitter {
     client.on("pong", this._heartbeat);
     this._clients[client.id] = client;
     this.emit("connected", client.id);
-    console.log(this);
+    logger.log(this);
     client.on("message", function (msg) {
       let message = JSON.parse(msg);
       self._handleMessage(client, message);
diff --git a/src/lib/Logger.js b/src/lib/Logger.js
new file mode 100644
index 00000000..8575924b
--- /dev/null
+++ b/src/lib/Logger.js
@@ -0,0 +1,82 @@
+const chalk = require('chalk');
+const readline = require('readline');
+
+function lpad(str, padString, length) {
+	while (str.toString().length < length) {
+		str = padString + ''+str;
+	}
+	return str;
+}
+
+class Logger {
+
+	constructor(log_level) {
+		this.log_level=log_level;
+	}
+	/*
+	Logging Levels
+	0: Minimum - Explicit logging & Errors
+	1: Info - 0 + Basic logging
+	2: Verbose - 1 + Verbose logging
+	3: Transient - 2 + Transient messages
+	*/
+	timestamp() {
+
+		let date=new Date();
+		var month = '' + (date.getMonth() + 1),
+			day = '' + date.getDate(),
+			year = date.getFullYear();
+
+		if (month.length < 2) month = '0' + month;
+		if (day.length < 2) day = '0' + day;
+		var offset;
+		if (date.getTimezoneOffset()<0) {
+			offset ='+'+(0-date.getTimezoneOffset())/60;
+		}else{
+			if (date.getTimezoneOffset()>0) {
+				offset ='+'+date.getTimezoneOffset()/60;
+			}else{
+				offset = '';
+			}
+		}
+		return [year, month, day].join('-')+' '+lpad(date.getHours(),'0',2)+ ':' + lpad(date.getMinutes(),'0',2) + ':' + lpad(date.getSeconds(),'0',2)+' GMT'+ offset;
+	}
+	log(msg) {
+		readline.clearLine(process.stdout,0);
+		readline.cursorTo(process.stdout,0,null);
+		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.magenta('[LOG]')+' '+msg+'\n');
+	}
+	info(msg) {
+		if (this.log_level>0) {
+			readline.clearLine(process.stdout,0);
+			readline.cursorTo(process.stdout,0,null);
+			process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.cyan('[INFO]')+' '+msg+'\n');
+		}
+	}
+	warning(msg) {
+		readline.clearLine(process.stdout,0);
+		readline.cursorTo(process.stdout,0,null);
+		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.yellow('[WARNING]')+' '+msg+'\n');
+	}
+	error(msg) {
+		readline.clearLine(process.stdout,0);
+		readline.cursorTo(process.stdout,0,null);
+		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.red('[ERROR]')+' '+msg+'\n');
+	}
+	verbose(msg) {
+		if (this.log_level>1) {
+			readline.clearLine(process.stdout,0);
+			readline.cursorTo(process.stdout,0,null);
+			process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.blue('[VERBOSE]')+' '+msg+'\n');
+		}
+	}
+	transient(msg) {
+		if (this.log_level>2) {
+			readline.clearLine(process.stdout,0);
+			readline.cursorTo(process.stdout,0,null);
+			process.stdout.write(chalk.white(msg));
+		}
+	}
+
+}
+module.exports=Logger;
\ No newline at end of file
diff --git a/src/lib/RendererLogger.js b/src/lib/RendererLogger.js
new file mode 100644
index 00000000..d0303066
--- /dev/null
+++ b/src/lib/RendererLogger.js
@@ -0,0 +1,59 @@
+import {
+    ipcRenderer,
+} from 'electron';
+import util from 'util';
+
+class RendererLogger {
+
+    constructor() {
+
+    }
+    log(msg) {
+        ipcRenderer.send('log', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    info(msg) {
+        ipcRenderer.send('info', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    warning(msg) {
+        ipcRenderer.send('warning', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    error(msg) {
+        ipcRenderer.send('error', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    verbose(msg) {
+        ipcRenderer.send('verbose', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    transient(msg) {
+        ipcRenderer.send('transient', {
+            level: 'log',
+            data: this.serialize(msg)
+        })
+    }
+    serialize(obj) {
+        if (typeof obj == 'object') {
+            return util.inspect(obj, {
+                compact: true,
+                breakLength: 80,
+                depth: 3
+            })
+        } else {
+            return obj;
+        }
+    }
+}
+module.exports = RendererLogger;
\ No newline at end of file
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index 7c93db23..87417df8 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -3,6 +3,9 @@ import BeetDB from '../../lib/BeetDB.js';
 const LOAD_APPS = 'LOAD_APPS';
 const ADD_APP = 'ADD_APP';
 const NEW_REQUEST = 'NEW_REQUEST';
+import RendererLogger from "../../lib/RendererLogger";
+
+const logger=new RendererLogger();
 
 const mutations = {
     [LOAD_APPS](state, apps) {
@@ -38,7 +41,7 @@ const actions = {
             commit(NEW_REQUEST, payload);
             resolve();
         }).catch((e) => {
-            console.log(e);
+            logger.log(e);
             reject();
         });
     });
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 96d22a02..47cd7184 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -75,7 +75,6 @@ const actions = {
 
 const getters = {};
 
-console.log(defaultLocale);
 const initialState = {
     'settings': {
         'locale': defaultLocale,
diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index e349c018..57f37218 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -13,6 +13,9 @@ const SET_WALLET_STATUS = 'SET_WALLET_STATUS';
 const SET_WALLET_UNLOCKED = 'SET_WALLET_UNLOCKED';
 const SET_WALLETLIST = 'SET_WALLETLIST';
 const REQ_NOTIFY = 'REQ_NOTIFY';
+import RendererLogger from "../../lib/RendererLogger";
+
+const logger=new RendererLogger();
 
 const wallet = {};
 
@@ -63,7 +66,7 @@ const actions = {
                 commit(GET_WALLET, wallet);
                 resolve();
             } catch (e) {
-                console.log(e);
+                logger.log(e);
                 reject();
             }
         });

From 127e3599bc250e30e02398ac0015db396dd2ad17 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 28 Oct 2018 09:37:41 +0200
Subject: [PATCH 31/35] Clean up

---
 src/lib/BeetAPI.js    | 34 +++++++++-------
 src/lib/BeetServer.js | 93 +++++++------------------------------------
 2 files changed, 35 insertions(+), 92 deletions(-)

diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 926c4255..88b688e2 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -3,12 +3,12 @@ import Queue from './Queue';
 import store from '../store/index.js';
 import RendererLogger from "./RendererLogger";
 
-const logger=new RendererLogger();
+const logger = new RendererLogger();
 
 var popupQ = new Queue();
 export default class BeetAPI {
 
-    static async handler(request, vueInst) {        
+    static async handler(request, vueInst) {
         logger.log(request);
         if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
         let result;
@@ -23,11 +23,11 @@ export default class BeetAPI {
             });
             logger.log('waiting');
             logger.log(store.state.WalletStore);
-            if (store.state.WalletStore.isUnlocked==false) {
-                
+            if (store.state.WalletStore.isUnlocked == false) {
+
                 vueInst.$refs.popupComp.showAlert(request);
             }
-            let unlocked=await store.state.WalletStore.unlocked.promise;
+            await store.state.WalletStore.unlocked.promise;
             result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
             finished.resolve(true);
@@ -51,13 +51,12 @@ export default class BeetAPI {
                 resolve: qresolve
             });
             logger.log('waiting2');
-            if (store.state.WalletStore.isUnlocked==false) {
-                //logger.log(vueInst.$children);
+            if (store.state.WalletStore.isUnlocked == false) {
                 vueInst.$refs.popupComp.showAlert('Please unlock');
             }
-            
+
             await previous.promise;
-            
+
             logger.log('waiting done');
             result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
@@ -68,7 +67,7 @@ export default class BeetAPI {
 
     static async [Actions.GET_ACCOUNT](request, vue) {
         try {
-            
+
             logger.log(vue);
             let response = await vue.requestAccess(request.payload);
             logger.log(response);
@@ -83,17 +82,24 @@ export default class BeetAPI {
     }
     static async [Actions.REQUEST_LINK](request, vue) {
         try {
-            
+
             logger.log(vue);
             let response = await vue.requestAccess(request);
             logger.log({
                 id: request.id,
-                result: response 
+                result: response
+            });
+            return Object.assign(request, {
+                identity: response
             });
-            return Object.assign(request, { identity: response});
         } catch (e) {
             logger.log(e);
-            return { id: request.id, response: { isLinked: false }};
+            return {
+                id: request.id,
+                response: {
+                    isLinked: false
+                }
+            };
         }
     }
     static async [Actions.VOTE_FOR](request, vue) {
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 11569d91..7f7d0d17 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -5,44 +5,9 @@ import store from '../store/index.js';
 import eccrypto from 'eccrypto';
 import RendererLogger from "./RendererLogger";
 
-const logger=new RendererLogger();
+const logger = new RendererLogger();
 
-let io = null;
 let vueInst = null;
-const socketHandler = (socket) => {
-
-    // TODO: Testing the event system.
-    // Events are sent to the plugins to notify them of changes
-    // such as identity changes, key removals, account un-linking
-    // and scatter being locked.
-    // setInterval(() => {
-    //     if(authenticated)
-    //         socket.emit('event', 'evented');
-    // }, 2000);
-
-
-    // When something connects we automatically
-    // notify it of a successful connection
-    //socket.emit('connected',version);
-    //let authorized=await vueInst.authorize(req);
-    //if (authorized) {
-    // All authenticated api requests pass through the 'api' route.
-    socket.on('api', async req => {
-        socket.emit('api', await BeetAPI.handler(Object.assign(req.data, {
-            plugin: req.plugin
-        }), vueInst));
-    });
-    socket.on('link', async req => {
-        //TODO
-        //socket.emit('link',await vueInst.)
-    })
-    socket.on('disconnect', () => {
-
-    });
-    //    }else{
-    //        socket.disconnect();
-    //    }
-};
 
 const linkHandler = async (req) => {
     let userResponse;
@@ -80,23 +45,23 @@ const authHandler = async (req) => {
 
     // TODO: Check against blacklist;    
     if (req.payload.apphash != null & req.payload.apphash != undefined) {
-        let apps=store.state.OriginStore.apps;        
+        let apps = store.state.OriginStore.apps;
         const app = apps.find(x => x.apphash === req.payload.apphash);
-        if (!app) {          
+        if (!app) {
             return Object.assign(req.payload, {
                 authenticate: false,
                 link: false
-            });  
-        }else{
+            });
+        } else {
             logger.log(req);
             logger.log(app);
-            if (req.payload.origin==app.origin && req.payload.appName==app.appName)  {
+            if (req.payload.origin == app.origin && req.payload.appName == app.appName) {
                 return Object.assign(req.payload, {
                     authenticate: true,
                     link: true,
                     app: app
                 });
-            }else{
+            } else {
                 return Object.assign(req.payload, {
                     authenticate: false,
                     link: false
@@ -115,23 +80,20 @@ export default class BeetServer {
 
     static initialize(vue) {
         vueInst = vue;
-        const server = window.require('http').createServer();
-        server.listen(60555, 'localhost');
-        const server2 = new BeetWS(60556, 10000);
-        io = window.require('socket.io').listen(server);
+        const server = new BeetWS(60556, 10000);
         logger.log('Beet listening...');
-        server2.on('link', async (data) => { 
-            
+        server.on('link', async (data) => {
+
             let status = await linkHandler(data);
             logger.log(status);
-            server2.respondLink(data.client, status);
+            server.respondLink(data.client, status);
         });
-        server2.on('authenticate', async (data) => {
+        server.on('authenticate', async (data) => {
             let status = await authHandler(data);
             status.id = data.id;
-            server2.respondAuth(data.client, status);
+            server.respondAuth(data.client, status);
         });
-        server2.on('api', async (data) => {
+        server.on('api', async (data) => {
             store.dispatch('OriginStore/newRequest', {
                 apphash: data.payload.apphash,
                 next_hash: data.payload.next_hash
@@ -139,32 +101,7 @@ export default class BeetServer {
             let status = await BeetAPI.handler(data, vueInst);
             logger.log(status);
             status.id = data.id;
-            server2.respondAPI(data.client, status);
-        });
-    }
-
-    static open() {
-        const namespace = io.of(`/btscompanion`);
-        namespace.on('connection', socket => {
-            socketHandler(socket);
-        })
-    }
-
-    static close() {
-        // Getting namespace
-        const socket = io.of(`/btscompanion`);
-
-        // Disconnecting all active connections to this namespace
-        Object.keys(socket.connected).map(socketId => {
-            socket.connected[socketId].disconnect();
+            server.respondAPI(data.client, status);
         });
-
-        // Removing all event emitter listeners.
-        socket.removeAllListeners();
-
-        // Deleting the namespace from the array of
-        // available namespaces for connections
-        delete io.nsps[`/btscompanion`];
     }
-
 }
\ No newline at end of file

From cdff4aa699b0a84fe6aebdd5599827cc03310c1d Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 28 Oct 2018 15:17:17 +0200
Subject: [PATCH 32/35] Extra clean-up and linting

---
 src/components/create.vue          | 279 ++++++++++++++---------------
 src/components/node-select.vue     | 101 +++++------
 src/config/config.js               |  13 +-
 src/config/i18n.js                 |  22 +--
 src/css/main.css                   |  52 +++---
 src/index.html                     |  12 +-
 src/index.js                       |  64 +++----
 src/lib/Authorisation.js           |   0
 src/lib/BeetAPI.js                 |  20 +--
 src/lib/BeetDB.js                  |   4 +-
 src/lib/BeetServer.js              |   8 -
 src/lib/BeetWS.js                  |  59 +++---
 src/lib/Logger.js                  | 140 +++++++--------
 src/lib/Operations.js              |  47 ++---
 src/store/index.js                 |   2 +-
 src/store/modules/OriginStore.js   |  25 ++-
 src/store/modules/SettingsStore.js |   8 +-
 src/store/modules/WalletStore.js   |  16 +-
 src/translations/common/en.json    |   2 +-
 19 files changed, 421 insertions(+), 453 deletions(-)
 delete mode 100644 src/lib/Authorisation.js

diff --git a/src/components/create.vue b/src/components/create.vue
index 121e045a..8dc172a5 100644
--- a/src/components/create.vue
+++ b/src/components/create.vue
@@ -180,153 +180,146 @@
 </template>
 
 <script>
-    import { PrivateKey } from "bitsharesjs";
-    import { Apis } from "bitsharesjs-ws";
-    import { chainList } from "../config/config.js";
-    import RendererLogger from "../lib/RendererLogger";
+import { PrivateKey } from "bitsharesjs";
+import { Apis } from "bitsharesjs-ws";
+import { chainList } from "../config/config.js";
+import RendererLogger from "../lib/RendererLogger";
 
-    const logger=new RendererLogger();
-    logger.log(chainList);
-    export default {
-        name: "Create",
-        i18nOptions: { namespaces: "common" },
-        data() {
-            return {
-                walletname: "",
-                accountname: "",
-                accountID: "",
-                activepk: "",
-                ownerpk: "",
-                memopk: "",
-                password: "",
-                confirmpassword: "",
-                step: 1,
-                s1c: "",
-                includeOwner: 0,
-                errorMsg: "",
-                selectedChain: 0,
-                chainList: chainList
-            };
-        },
-        methods: {
-            step1: function() {
-                this.step = 1;
-            },
-            step2: function() {
-                if (this.walletname.trim() == "") {
-                    logger.log("Cannot create a wallet with an empty name.");
-                    this.errorMsg = this.$t('empty_wallet_error');
-                    this.$refs.errorModal.show();
-                    this.s1c = "is-invalid";
-                } else {
-                    let wallets = JSON.parse(localStorage.getItem("wallets"));
+const logger = new RendererLogger();
 
-                    if (
-                        wallets &&
-                        wallets.filter(wallet => wallet.name === this.walletname.trim())
-                        .length > 0
-                    ) {
-                        logger.log("A wallet with this name already exists.");
+export default {
+  name: "Create",
+  i18nOptions: { namespaces: "common" },
+  data() {
+    return {
+      walletname: "",
+      accountname: "",
+      accountID: "",
+      activepk: "",
+      ownerpk: "",
+      memopk: "",
+      password: "",
+      confirmpassword: "",
+      step: 1,
+      s1c: "",
+      includeOwner: 0,
+      errorMsg: "",
+      selectedChain: 0,
+      chainList: chainList
+    };
+  },
+  methods: {
+    step1: function() {
+      this.step = 1;
+    },
+    step2: function() {
+      if (this.walletname.trim() == "") {
+        this.errorMsg = this.$t("empty_wallet_error");
+        this.$refs.errorModal.show();
+        this.s1c = "is-invalid";
+      } else {
+        let wallets = JSON.parse(localStorage.getItem("wallets"));
 
-                        this.errorMsg = this.$t('duplicate_wallet_error');
-                        this.$refs.errorModal.show();
-                        this.s1c = "is-invalid";
-                    } else {
-                        this.walletname = this.walletname.trim();
-                        this.step = 2;
-                    }
-                }
-            },
-            step3: async function() {
-                let apkey, mpkey, opkey;
-                if (this.accountname == "") {
-                    this.errorMsg = this.$t('missing_account_error',{'chain': this.selectedChain});
-                    this.$refs.errorModal.show();
-                    return;
-                }
-                try {
-                    apkey = PrivateKey.fromWif(this.activepk)
-                        .toPublicKey()
-                        .toString(this.selectedChain);
-                    mpkey = PrivateKey.fromWif(this.memopk)
-                        .toPublicKey()
-                        .toString(this.selectedChain);
-                    if (this.includeOwner == 1) {
-                        opkey = PrivateKey.fromWif(this.ownerpk)
-                            .toPublicKey()
-                            .toString(this.selectedChain);
-                    }
-                } catch (e) {
-                    logger.log("Invalid Private Key format.");
-                    this.errorMsg = this.$t('invalid_key_error');
-                    this.$refs.errorModal.show();
-                    return;
-                }
-                this.$refs.loaderAnimModal.show();
-                let verified = await Apis.instance(
-                    this.$store.state.SettingsStore.settings.selected_node,
-                    true
-                ).init_promise.then(() => {
-                    return Apis.instance()
-                        .db_api()
-                        .exec("get_full_accounts", [[this.accountname], false])
-                        .then(res => {
-                            // TODO: Better verification
-                            if (
-                                res[0][1].account.active.key_auths[0][0] == apkey &&
-                                (res[0][1].account.owner.key_auths[0][0] == opkey ||
-                                this.includeOwner == 0) &&
-                                res[0][1].account.options.memo_key == mpkey
-                            ) {
-                                logger.log(
-                                    "Keys verified. Account ID is: " + res[0][1].account.id
-                                );
-                                this.$refs.loaderAnimModal.hide();
-                                return res[0][1].account.id;
-                            } else {
-                                logger.log("Keys not verified for provided account name.");
-                                this.$refs.loaderAnimModal.hide();
-                                this.$refs.errorModal.show();
-                                this.errorMsg = this.$t('unverified_account_error');
-                                return null;
-                            }
-                    });
-                });
-                if (verified != null) {
-                    this.accountID = verified;
-                    this.step = 3;
-                } else {
-                    return;
-                }
-            },
-            verifyAndCreate: async function() {
-                if (
-                    this.password != this.confirmpassword ||
-                    this.password == ""
-                ) {
-                    this.$refs.errorModal.show();
-                    this.errorMsg = this.$t('confirm_pass_error');
-                    return;
-                }
+        if (
+          wallets &&
+          wallets.filter(wallet => wallet.name === this.walletname.trim())
+            .length > 0
+        ) {
+          this.errorMsg = this.$t("duplicate_wallet_error");
+          this.$refs.errorModal.show();
+          this.s1c = "is-invalid";
+        } else {
+          this.walletname = this.walletname.trim();
+          this.step = 2;
+        }
+      }
+    },
+    step3: async function() {
+      let apkey, mpkey, opkey;
+      if (this.accountname == "") {
+        this.errorMsg = this.$t("missing_account_error", {
+          chain: this.selectedChain
+        });
+        this.$refs.errorModal.show();
+        return;
+      }
+      try {
+        apkey = PrivateKey.fromWif(this.activepk)
+          .toPublicKey()
+          .toString(this.selectedChain);
+        mpkey = PrivateKey.fromWif(this.memopk)
+          .toPublicKey()
+          .toString(this.selectedChain);
+        if (this.includeOwner == 1) {
+          opkey = PrivateKey.fromWif(this.ownerpk)
+            .toPublicKey()
+            .toString(this.selectedChain);
+        }
+      } catch (e) {
+        this.errorMsg = this.$t("invalid_key_error");
+        this.$refs.errorModal.show();
+        return;
+      }
+      this.$refs.loaderAnimModal.show();
+      let verified = await Apis.instance(
+        this.$store.state.SettingsStore.settings.selected_node,
+        true
+      ).init_promise.then(() => {
+        return Apis.instance()
+          .db_api()
+          .exec("get_full_accounts", [[this.accountname], false])
+          .then(res => {
+            // TODO: Better verification
+            if (
+              res[0][1].account.active.key_auths[0][0] == apkey &&
+              (res[0][1].account.owner.key_auths[0][0] == opkey ||
+                this.includeOwner == 0) &&
+              res[0][1].account.options.memo_key == mpkey
+            ) {
+              this.$refs.loaderAnimModal.hide();
+              return res[0][1].account.id;
+            } else {
+              this.$refs.loaderAnimModal.hide();
+              this.$refs.errorModal.show();
+              this.errorMsg = this.$t("unverified_account_error");
+              return null;
+            }
+          });
+      });
+      if (verified != null) {
+        this.accountID = verified;
+        this.step = 3;
+      } else {
+        return;
+      }
+    },
+    verifyAndCreate: async function() {
+      if (this.password != this.confirmpassword || this.password == "") {
+        this.$refs.errorModal.show();
+        this.errorMsg = this.$t("confirm_pass_error");
+        return;
+      }
 
-                this.$refs.loaderAnimModal.show();
+      this.$refs.loaderAnimModal.show();
 
-                if (this.accountID !== null) {
-                    this.$store
-                        .dispatch("WalletStore/saveWallet", { walletname: this.walletname, password: this.password, walletdata:  {
-                            accountName: this.accountname,
-                            accountID: this.accountID,
-                            chain: this.selectedChain,
-                            keys: {
-                                active: this.activepk,
-                                owner: this.ownerpk,
-                                memo: this.memopk
-                            }
-                        }
-                        });
-                    this.$router.replace("/dashboard");
-                }
+      if (this.accountID !== null) {
+        this.$store.dispatch("WalletStore/saveWallet", {
+          walletname: this.walletname,
+          password: this.password,
+          walletdata: {
+            accountName: this.accountname,
+            accountID: this.accountID,
+            chain: this.selectedChain,
+            keys: {
+              active: this.activepk,
+              owner: this.ownerpk,
+              memo: this.memopk
             }
-        }
-    };
+          }
+        });
+        this.$router.replace("/dashboard");
+      }
+    }
+  }
+};
 </script>
\ No newline at end of file
diff --git a/src/components/node-select.vue b/src/components/node-select.vue
index af6ca94f..c4255b57 100644
--- a/src/components/node-select.vue
+++ b/src/components/node-select.vue
@@ -28,59 +28,56 @@
 </template>
 
 <script>
-    import { Apis } from "bitsharesjs-ws";
-    import { nodeList } from "../config/config";
-    import RendererLogger from "../lib/RendererLogger";
+import { Apis } from "bitsharesjs-ws";
+import { nodeList } from "../config/config";
+import RendererLogger from "../lib/RendererLogger";
 
-    const logger=new RendererLogger();
+const logger = new RendererLogger();
 
-    export default {
-        name: "NodeSelect",
-        i18nOptions: { namespaces: "common" },
-        data() {
-            return {
-                nodes: nodeList,
-                isConnected: false,
-                api: null,
-                selectedNode: this.$store.state.SettingsStore.settings.selected_node
-            };
-        },
-        watch: {
-            selectedNode: function() {
-                logger.log("Switching Node.");
-                Apis.close().then(() => {
-                    logger.log("Closed Node.");
-                    this.isConnected = false;
-                    Apis.instance(
-                        this.selectedNode,
-                        true,
-                        10000,
-                        { enableCrypto: false, enableOrders: false },
-                        this.onClose
-                    ).init_promise.then(() => {
-                        logger.log("Opened Node");
-                        this.$store.dispatch("SettingsStore/setNode", {
-                            node: this.selectedNode
-                        });
-                        this.isConnected = true;
-                    });
-                });
-            }
-        },
-        mounted() {
-            Apis.instance(
-                this.selectedNode,
-                true,
-                10000,
-                { enableCrypto: false, enableOrders: false },
-                this.onClose
-            ).init_promise.then(() => {
-                this.isConnected = true;
-                this.$emit("first-connect");
-            });
-        },
-        onClose() {
-            this.isConnected = false;
-        }
+export default {
+  name: "NodeSelect",
+  i18nOptions: { namespaces: "common" },
+  data() {
+    return {
+      nodes: nodeList,
+      isConnected: false,
+      api: null,
+      selectedNode: this.$store.state.SettingsStore.settings.selected_node
     };
+  },
+  watch: {
+    selectedNode: function() {
+      Apis.close().then(() => {
+        this.isConnected = false;
+        Apis.instance(
+          this.selectedNode,
+          true,
+          10000,
+          { enableCrypto: false, enableOrders: false },
+          this.onClose
+        ).init_promise.then(() => {
+          this.$store.dispatch("SettingsStore/setNode", {
+            node: this.selectedNode
+          });
+          this.isConnected = true;
+        });
+      });
+    }
+  },
+  mounted() {
+    Apis.instance(
+      this.selectedNode,
+      true,
+      10000,
+      { enableCrypto: false, enableOrders: false },
+      this.onClose
+    ).init_promise.then(() => {
+      this.isConnected = true;
+      this.$emit("first-connect");
+    });
+  },
+  onClose() {
+    this.isConnected = false;
+  }
+};
 </script>
diff --git a/src/config/config.js b/src/config/config.js
index ac6d0f61..53f9eb7f 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,7 +1,12 @@
-export const version ={release: 1, name:'1.0.0beta'};
-export const chainList=[
-    { short: 'BTS', name: 'BitShares', chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8'}
-];
+export const version = {
+    release: 1,
+    name: '1.0.0beta'
+};
+export const chainList = [{
+    short: 'BTS',
+    name: 'BitShares',
+    chainId: '4018d7844c78f6a6c41c6a552b898022310fc5dec06da467ee7905a8dad512c8'
+}];
 export const nodeList = [
 
     {
diff --git a/src/config/i18n.js b/src/config/i18n.js
index ce6251f2..03245b07 100644
--- a/src/config/i18n.js
+++ b/src/config/i18n.js
@@ -1,15 +1,15 @@
 let localelist = [{
-    iso: 'en',
-    name: 'English',
-    dir: 'ltr',
-}
-//,
-// {
-//    iso: 'de',
-//    name: 'Deutsch',
-//    dir: 'ltr',
-//}
+        iso: 'en',
+        name: 'English',
+        dir: 'ltr',
+    }
+    //,
+    // {
+    //    iso: 'de',
+    //    name: 'Deutsch',
+    //    dir: 'ltr',
+    //}
 ];
 
-export const locales=localelist;
+export const locales = localelist;
 export const defaultLocale = localelist[0];
\ No newline at end of file
diff --git a/src/css/main.css b/src/css/main.css
index ab9ef8a4..23b45654 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -237,53 +237,61 @@ pre {
   position: absolute;
   top: 10px;
   right: 10px;
-  left:10px;
-  text-align:right;
+  left: 10px;
+  text-align: right;
 }
-.lang-select.multiselect--active .singleLabel{
-  background:white;
+
+.lang-select.multiselect--active .singleLabel {
+  background: white;
   color: #0a4f79;
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;
 }
-.lang-select .singleLabel{
-  text-transform:uppercase;
-  font-weight:bold;
-  padding:5px 10px;
+
+.lang-select .singleLabel {
+  text-transform: uppercase;
+  font-weight: bold;
+  padding: 5px 10px;
 }
-.lang-select .singleLabel:hover {  
+
+.lang-select .singleLabel:hover {
   cursor: pointer;
-  background:white;
+  background: white;
   color: #0a4f79;
   border-radius: 5px;
- 
+
 }
-.lang-select .options .isoCode{
-  text-transform:uppercase;
+
+.lang-select .options .isoCode {
+  text-transform: uppercase;
 }
+
 .lang-select:focus {
-  outline:0;
+  outline: 0;
 }
+
 .lang-select ul {
-  list-style:none;
-  padding:0;
-  background:white;
+  list-style: none;
+  padding: 0;
+  background: white;
   color: #0a4f79;
   border-radius: 5px;
   border-top-right-radius: 0px;
-  overflow:hidden;
+  overflow: hidden;
   max-height: 80vh;
-  font-size:14px;
+  font-size: 14px;
 }
 
 .lang-select ul li {
-  text-align:left;
-  padding:5px 10px;
+  text-align: left;
+  padding: 5px 10px;
   border-bottom: 1px solid #0a4f79;
 }
+
 .lang-select .multiselect__option--selected {
-  font-weight:bold;
+  font-weight: bold;
 }
+
 .lang-select ul li:hover {
   background: #77c5ec;
   cursor: pointer;
diff --git a/src/index.html b/src/index.html
index aef7e657..68258a76 100644
--- a/src/index.html
+++ b/src/index.html
@@ -30,14 +30,14 @@
         import VueI18Next from '@panter/vue-i18next';
         import BeetServer from "./lib/BeetServer";
         import RendererLogger from "./lib/RendererLogger";
-        
 
-        
+
+
         Vue.use(VueI18Next);
         Vue.use(BootstrapVue);
         Vue.use(VueRouter);
-        Vue.component('Popups',Popups);
-        const logger=new RendererLogger;
+        Vue.component('Popups', Popups);
+        const logger = new RendererLogger;
         store.dispatch("SettingsStore/loadSettings");
         store.dispatch("OriginStore/loadApps");
         i18next.use(Backend).init({
@@ -54,10 +54,10 @@
             store,
             i18n: i18n
         }).$mount('#app');
-        
+
         BeetServer.initialize(app);
         BeetServer.open();
-        
+
         window.onerror = function (msg, url, lineNo, columnNo, error) {
             logger.error(error);
             return false;
diff --git a/src/index.js b/src/index.js
index 67cd558b..fd77121d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -16,10 +16,10 @@ import Logger from './lib/Logger';
 let mainWindow;
 
 const isDevMode = process.execPath.match(/[\\/]electron/);
-const logger=new Logger(3);
+const logger = new Logger(3);
 
 if (isDevMode) enableLiveReload();
-let first=true;
+let first = true;
 let tray = null;
 let minimised = false;
 const createWindow = async () => {
@@ -76,8 +76,8 @@ const createWindow = async () => {
         title: "Beet is minimised.",
         content: "It will run in the background until you quit."
       });
-      first=false;
-    } 
+      first = false;
+    }
     minimised = true;
     mainWindow.hide();
   });
@@ -90,16 +90,16 @@ const createWindow = async () => {
   mainWindow.on('close', function (event) {
     if (!app.isQuiting) {
       event.preventDefault();
-      
-    if (first) {
-      tray.displayBalloon({
-        icon: __dirname + '/img/bitshares.png',
-        title: "Beet is minimised.",
-        content: "It will run in the background until you quit."
-      });
-      first=false;
-    } 
-      
+
+      if (first) {
+        tray.displayBalloon({
+          icon: __dirname + '/img/bitshares.png',
+          title: "Beet is minimised.",
+          content: "It will run in the background until you quit."
+        });
+        first = false;
+      }
+
       minimised = true;
       mainWindow.hide();
     }
@@ -108,35 +108,35 @@ const createWindow = async () => {
   });
   ipcMain.on('notify', (event, arg) => {
     if (minimised) {
-      if (arg=='request') {
-      tray.displayBalloon({
-        icon: __dirname + '/img/bitshares.png',
-        title: "Beet has received a new request.",
-        content: "Click here to view"
-      });
-    }else{
-      tray.displayBalloon({
-        icon: __dirname + '/img/bitshares.png',
-        title: arg,
-        content: "Click here to view"
-      });
-    }
+      if (arg == 'request') {
+        tray.displayBalloon({
+          icon: __dirname + '/img/bitshares.png',
+          title: "Beet has received a new request.",
+          content: "Click here to view"
+        });
+      } else {
+        tray.displayBalloon({
+          icon: __dirname + '/img/bitshares.png',
+          title: arg,
+          content: "Click here to view"
+        });
+      }
     }
   });
-  
+
   ipcMain.on('log', (event, arg) => {
-    
+
     logger[arg.level](arg.data);
   });
-  tray.on('click', (event) => {
-    
+  tray.on('click', () => {
+
     mainWindow.setAlwaysOnTop(true);
     mainWindow.show();
     mainWindow.focus();
     mainWindow.setAlwaysOnTop(false);
     minimised = false;
   });
-  tray.on('balloon-click', (event) => {
+  tray.on('balloon-click', () => {
     mainWindow.setAlwaysOnTop(true);
     mainWindow.show();
     mainWindow.focus();
diff --git a/src/lib/Authorisation.js b/src/lib/Authorisation.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/lib/BeetAPI.js b/src/lib/BeetAPI.js
index 88b688e2..f7db1a00 100644
--- a/src/lib/BeetAPI.js
+++ b/src/lib/BeetAPI.js
@@ -1,15 +1,14 @@
 import * as Actions from './Actions';
 import Queue from './Queue';
 import store from '../store/index.js';
+/*
 import RendererLogger from "./RendererLogger";
-
 const logger = new RendererLogger();
-
+*/
 var popupQ = new Queue();
 export default class BeetAPI {
 
     static async handler(request, vueInst) {
-        logger.log(request);
         if (!Object.keys(Actions).map(key => Actions[key]).includes(request.type)) return;
         let result;
         if (popupQ.isEmpty()) {
@@ -21,8 +20,6 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            logger.log('waiting');
-            logger.log(store.state.WalletStore);
             if (store.state.WalletStore.isUnlocked == false) {
 
                 vueInst.$refs.popupComp.showAlert(request);
@@ -50,14 +47,12 @@ export default class BeetAPI {
                 promise: queued,
                 resolve: qresolve
             });
-            logger.log('waiting2');
             if (store.state.WalletStore.isUnlocked == false) {
                 vueInst.$refs.popupComp.showAlert('Please unlock');
             }
 
             await previous.promise;
 
-            logger.log('waiting done');
             result = await this[request.type](request, vueInst.$refs.popupComp);
             let finished = popupQ.dequeue();
             finished.resolve(true);
@@ -67,33 +62,22 @@ export default class BeetAPI {
 
     static async [Actions.GET_ACCOUNT](request, vue) {
         try {
-
-            logger.log(vue);
             let response = await vue.requestAccess(request.payload);
-            logger.log(response);
             return {
                 id: request.id,
                 result: response
             };
         } catch (e) {
-            logger.log(e);
             return e;
         }
     }
     static async [Actions.REQUEST_LINK](request, vue) {
         try {
-
-            logger.log(vue);
             let response = await vue.requestAccess(request);
-            logger.log({
-                id: request.id,
-                result: response
-            });
             return Object.assign(request, {
                 identity: response
             });
         } catch (e) {
-            logger.log(e);
             return {
                 id: request.id,
                 response: {
diff --git a/src/lib/BeetDB.js b/src/lib/BeetDB.js
index f843dec5..8ecb5a0f 100644
--- a/src/lib/BeetDB.js
+++ b/src/lib/BeetDB.js
@@ -1,9 +1,9 @@
 import Dexie from 'dexie';
 const BeetDB = new Dexie('BeetDB');
- 
+
 BeetDB.version(1).stores({
     apps: `++id,appName, origin, &apphash, account_id, chain, secret,next_hash`,
     settings: `++id,setting, value`
-}); 
+});
 
 export default BeetDB;
\ No newline at end of file
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 7f7d0d17..e4d51e64 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -12,11 +12,8 @@ let vueInst = null;
 const linkHandler = async (req) => {
     let userResponse;
     try {
-        logger.log(req);
         userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
-        logger.log(userResponse);
         let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
-        logger.log(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id);
         let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
         store.dispatch('OriginStore/addApp', {
             appName: req.appName,
@@ -53,8 +50,6 @@ const authHandler = async (req) => {
                 link: false
             });
         } else {
-            logger.log(req);
-            logger.log(app);
             if (req.payload.origin == app.origin && req.payload.appName == app.appName) {
                 return Object.assign(req.payload, {
                     authenticate: true,
@@ -81,11 +76,9 @@ export default class BeetServer {
     static initialize(vue) {
         vueInst = vue;
         const server = new BeetWS(60556, 10000);
-        logger.log('Beet listening...');
         server.on('link', async (data) => {
 
             let status = await linkHandler(data);
-            logger.log(status);
             server.respondLink(data.client, status);
         });
         server.on('authenticate', async (data) => {
@@ -99,7 +92,6 @@ export default class BeetServer {
                 next_hash: data.payload.next_hash
             });
             let status = await BeetAPI.handler(data, vueInst);
-            logger.log(status);
             status.id = data.id;
             server.respondAPI(data.client, status);
         });
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index fd47d27c..daab286f 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -12,32 +12,30 @@ import crypto from 'crypto';
 import eccrypto from 'eccrypto';
 import Https from 'https';
 import Fs from 'fs';
+/*
 import RendererLogger from "./RendererLogger";
-
-const logger=new RendererLogger();
-
+const logger = new RendererLogger();
+*/
 export default class BeetWS extends EventEmitter {
   constructor(port, timeout) {
     super() // required
     var self = this;
     const httpsServer = Https.createServer({
-      key: Fs.readFileSync(__dirname+'/ssl/beet.key'),
-      cert: Fs.readFileSync(__dirname+'/ssl/beet.cert')
+      key: Fs.readFileSync(__dirname + '/ssl/beet.key'),
+      cert: Fs.readFileSync(__dirname + '/ssl/beet.cert')
     });
     const server = new WebSocket.Server({
       server: httpsServer
     });
-    httpsServer.listen(port); 
-    this._clients = []; 
+    httpsServer.listen(port);
+    this._clients = [];
     this._monitor = setInterval(function () {
       for (var clientid in self._clients) {
 
         let client = self._clients[clientid];
-        logger.log(client);
         if (client.isAlive === false || client.readyState != 1) {
           self.emit("disconnected", client.id);
           delete(self._clients[client.id]);
-          logger.log("Terminating client")
           return client.terminate();
         } else {
           client.isAlive = false;
@@ -45,7 +43,6 @@ export default class BeetWS extends EventEmitter {
         }
       }
     }, timeout);
-    logger.log(self);
     server.on("connection", (client) => {
       self._handleConnection(client);
     });
@@ -57,36 +54,33 @@ export default class BeetWS extends EventEmitter {
     this.isAlive = true;
   }
   _handleMessage(client, data) {
- 
-    if (data.type == 'version') { 
+
+    if (data.type == 'version') {
       client.send('{ "type": "version", "error": false, "result": { "version": ' + JSON.stringify(version) + '}}');
-    }else{
+    } else {
       if (client.isAuthenticated) {
         if (client.isLinked) {
           if (data.type == 'api') {
-            let hash =  CryptoJS.SHA256(''+data.id).toString();
-            logger.log(hash);
-            logger.log(client.next_hash);
+            let hash = CryptoJS.SHA256('' + data.id).toString();
             if (hash == client.next_hash) {
               client.otp.counter = data.id;
               var key = client.otp.generate();
               try {
                 var msg = JSON.parse(CryptoJS.AES.decrypt(data.payload, key).toString(CryptoJS.enc.Utf8));
 
-                msg.origin=client.origin;
-                msg.appName=client.appName;
-                msg.apphash=client.apphash;
-                msg.chain=client.chain;
-                msg.account_id=client.account_id;
+                msg.origin = client.origin;
+                msg.appName = client.appName;
+                msg.apphash = client.apphash;
+                msg.chain = client.chain;
+                msg.account_id = client.account_id;
                 client.next_hash = msg.next_hash;
                 this.emit('api', {
                   "client": client.id,
                   "id": data.id,
-                  "type":msg.method,
+                  "type": msg.method,
                   "payload": msg
                 });
               } catch (e) {
-                logger.log (e);
                 client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code": 3, message": "Could not decrypt message"}}');
               }
             } else {
@@ -97,21 +91,18 @@ export default class BeetWS extends EventEmitter {
           }
         } else {
           if (data.type == 'link') {
-            logger.log(client);
-            let linkobj= {
+            let linkobj = {
               "id": data.id,
               "client": client.id,
               "payload": data.payload,
               "chain": data.payload.chain,
               "origin": client.origin,
               "appName": client.appName,
-              "browser":client.browser,
-              "key":client.pk,
+              "browser": client.browser,
+              "key": client.pk,
               "type": 'link'
             };
-            logger.log('Link:');
-            logger.log(linkobj);
-            this.emit('link',linkobj);
+            this.emit('link', linkobj);
           } else {
             client.send('{ "id": "' + data.id + '", "error": true, "payload": { "code":4, "message": "This app is not yet linked"}}');
           }
@@ -129,7 +120,7 @@ export default class BeetWS extends EventEmitter {
       }
     }
   }
-  async respondLink(client, result) {    
+  async respondLink(client, result) {
     if (result.isLinked == true) {
       this._clients[client].isLinked = true;
       this._clients[client].apphash = result.apphash;
@@ -153,13 +144,12 @@ export default class BeetWS extends EventEmitter {
   respondAPI(client, response) {
     this._clients[client].otp.counter = response.id;
     var key = this._clients[client].otp.generate();
-    
+
     var payload = CryptoJS.AES.encrypt(JSON.stringify(response.result), key).toString();
     this._clients[client].send('{"id": ' + response.id + ', "error": false , "encrypted": true, "payload": "' + payload + '"}');
   }
   respondAuth(client, result) {
     if (result.authenticate) {
-      logger.log(result);
       this._clients[client].isAuthenticated = true;
       this._clients[client].origin = result.origin;
       this._clients[client].appName = result.appName;
@@ -180,7 +170,7 @@ export default class BeetWS extends EventEmitter {
         });
         this._clients[client].otp = otp;
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
-      } else { 
+      } else {
         this._clients[client].pk = crypto.randomBytes(32);
         let pubkey = eccrypto.getPublic(this._clients[client].pk).toString('hex');
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
@@ -197,7 +187,6 @@ export default class BeetWS extends EventEmitter {
     client.on("pong", this._heartbeat);
     this._clients[client.id] = client;
     this.emit("connected", client.id);
-    logger.log(this);
     client.on("message", function (msg) {
       let message = JSON.parse(msg);
       self._handleMessage(client, message);
diff --git a/src/lib/Logger.js b/src/lib/Logger.js
index 8575924b..bd7e7dfc 100644
--- a/src/lib/Logger.js
+++ b/src/lib/Logger.js
@@ -2,81 +2,81 @@ const chalk = require('chalk');
 const readline = require('readline');
 
 function lpad(str, padString, length) {
-	while (str.toString().length < length) {
-		str = padString + ''+str;
-	}
-	return str;
+    while (str.toString().length < length) {
+        str = padString + '' + str;
+    }
+    return str;
 }
 
 class Logger {
 
-	constructor(log_level) {
-		this.log_level=log_level;
-	}
-	/*
-	Logging Levels
-	0: Minimum - Explicit logging & Errors
-	1: Info - 0 + Basic logging
-	2: Verbose - 1 + Verbose logging
-	3: Transient - 2 + Transient messages
-	*/
-	timestamp() {
+    constructor(log_level) {
+        this.log_level = log_level;
+    }
+    /*
+    Logging Levels
+    0: Minimum - Explicit logging & Errors
+    1: Info - 0 + Basic logging
+    2: Verbose - 1 + Verbose logging
+    3: Transient - 2 + Transient messages
+    */
+    timestamp() {
 
-		let date=new Date();
-		var month = '' + (date.getMonth() + 1),
-			day = '' + date.getDate(),
-			year = date.getFullYear();
+        let date = new Date();
+        var month = '' + (date.getMonth() + 1),
+            day = '' + date.getDate(),
+            year = date.getFullYear();
 
-		if (month.length < 2) month = '0' + month;
-		if (day.length < 2) day = '0' + day;
-		var offset;
-		if (date.getTimezoneOffset()<0) {
-			offset ='+'+(0-date.getTimezoneOffset())/60;
-		}else{
-			if (date.getTimezoneOffset()>0) {
-				offset ='+'+date.getTimezoneOffset()/60;
-			}else{
-				offset = '';
-			}
-		}
-		return [year, month, day].join('-')+' '+lpad(date.getHours(),'0',2)+ ':' + lpad(date.getMinutes(),'0',2) + ':' + lpad(date.getSeconds(),'0',2)+' GMT'+ offset;
-	}
-	log(msg) {
-		readline.clearLine(process.stdout,0);
-		readline.cursorTo(process.stdout,0,null);
-		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.magenta('[LOG]')+' '+msg+'\n');
-	}
-	info(msg) {
-		if (this.log_level>0) {
-			readline.clearLine(process.stdout,0);
-			readline.cursorTo(process.stdout,0,null);
-			process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.cyan('[INFO]')+' '+msg+'\n');
-		}
-	}
-	warning(msg) {
-		readline.clearLine(process.stdout,0);
-		readline.cursorTo(process.stdout,0,null);
-		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.yellow('[WARNING]')+' '+msg+'\n');
-	}
-	error(msg) {
-		readline.clearLine(process.stdout,0);
-		readline.cursorTo(process.stdout,0,null);
-		process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.red('[ERROR]')+' '+msg+'\n');
-	}
-	verbose(msg) {
-		if (this.log_level>1) {
-			readline.clearLine(process.stdout,0);
-			readline.cursorTo(process.stdout,0,null);
-			process.stdout.write(chalk.white(this.timestamp())+' - '+chalk.blue('[VERBOSE]')+' '+msg+'\n');
-		}
-	}
-	transient(msg) {
-		if (this.log_level>2) {
-			readline.clearLine(process.stdout,0);
-			readline.cursorTo(process.stdout,0,null);
-			process.stdout.write(chalk.white(msg));
-		}
-	}
+        if (month.length < 2) month = '0' + month;
+        if (day.length < 2) day = '0' + day;
+        var offset;
+        if (date.getTimezoneOffset() < 0) {
+            offset = '+' + (0 - date.getTimezoneOffset()) / 60;
+        } else {
+            if (date.getTimezoneOffset() > 0) {
+                offset = '+' + date.getTimezoneOffset() / 60;
+            } else {
+                offset = '';
+            }
+        }
+        return [year, month, day].join('-') + ' ' + lpad(date.getHours(), '0', 2) + ':' + lpad(date.getMinutes(), '0', 2) + ':' + lpad(date.getSeconds(), '0', 2) + ' GMT' + offset;
+    }
+    log(msg) {
+        readline.clearLine(process.stdout, 0);
+        readline.cursorTo(process.stdout, 0, null);
+        process.stdout.write(chalk.white(this.timestamp()) + ' - ' + chalk.magenta('[LOG]') + ' ' + msg + '\n');
+    }
+    info(msg) {
+        if (this.log_level > 0) {
+            readline.clearLine(process.stdout, 0);
+            readline.cursorTo(process.stdout, 0, null);
+            process.stdout.write(chalk.white(this.timestamp()) + ' - ' + chalk.cyan('[INFO]') + ' ' + msg + '\n');
+        }
+    }
+    warning(msg) {
+        readline.clearLine(process.stdout, 0);
+        readline.cursorTo(process.stdout, 0, null);
+        process.stdout.write(chalk.white(this.timestamp()) + ' - ' + chalk.yellow('[WARNING]') + ' ' + msg + '\n');
+    }
+    error(msg) {
+        readline.clearLine(process.stdout, 0);
+        readline.cursorTo(process.stdout, 0, null);
+        process.stdout.write(chalk.white(this.timestamp()) + ' - ' + chalk.red('[ERROR]') + ' ' + msg + '\n');
+    }
+    verbose(msg) {
+        if (this.log_level > 1) {
+            readline.clearLine(process.stdout, 0);
+            readline.cursorTo(process.stdout, 0, null);
+            process.stdout.write(chalk.white(this.timestamp()) + ' - ' + chalk.blue('[VERBOSE]') + ' ' + msg + '\n');
+        }
+    }
+    transient(msg) {
+        if (this.log_level > 2) {
+            readline.clearLine(process.stdout, 0);
+            readline.cursorTo(process.stdout, 0, null);
+            process.stdout.write(chalk.white(msg));
+        }
+    }
 
 }
-module.exports=Logger;
\ No newline at end of file
+module.exports = Logger;
\ No newline at end of file
diff --git a/src/lib/Operations.js b/src/lib/Operations.js
index 3f40826c..580f3fc9 100644
--- a/src/lib/Operations.js
+++ b/src/lib/Operations.js
@@ -9,32 +9,33 @@ export default class operations {
         let op_data;
         let api = Apis.instance();
         switch (data.action) {
-            case 'vote': {
-                op_type = 'account_update';
-                let accounts = await api.db_api()
-                    .exec("get_objects", [
-                        [account_id]
-                    ]);
-                let updateObject = {
-                    account: account_id
-                };
+            case 'vote':
+                {
+                    op_type = 'account_update';
+                    let accounts = await api.db_api()
+                        .exec("get_objects", [
+                            [account_id]
+                        ]);
+                    let updateObject = {
+                        account: account_id
+                    };
 
-                let account = accounts[0];
+                    let account = accounts[0];
 
-                let new_options = account.options;
-                new_options.votes.push(data.vote_id)
-                new_options.votes = new_options.votes.sort((a, b) => {
-                    let a_split = a.split(":");
-                    let b_split = b.split(":");
-                    return (
-                        parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
-                    );
-                });
-                updateObject.new_options = new_options;
-                op_data = updateObject;
+                    let new_options = account.options;
+                    new_options.votes.push(data.vote_id)
+                    new_options.votes = new_options.votes.sort((a, b) => {
+                        let a_split = a.split(":");
+                        let b_split = b.split(":");
+                        return (
+                            parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
+                        );
+                    });
+                    updateObject.new_options = new_options;
+                    op_data = updateObject;
 
-                break;
-            }
+                    break;
+                }
         }
         return {
             op_type: op_type,
diff --git a/src/store/index.js b/src/store/index.js
index 5b1f0658..8680bdf1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -12,6 +12,6 @@ const store = new Vuex.Store({
         SettingsStore,
         OriginStore
     }
-  });
+});
 
 export default store;
\ No newline at end of file
diff --git a/src/store/modules/OriginStore.js b/src/store/modules/OriginStore.js
index 87417df8..a372cd84 100644
--- a/src/store/modules/OriginStore.js
+++ b/src/store/modules/OriginStore.js
@@ -3,9 +3,6 @@ import BeetDB from '../../lib/BeetDB.js';
 const LOAD_APPS = 'LOAD_APPS';
 const ADD_APP = 'ADD_APP';
 const NEW_REQUEST = 'NEW_REQUEST';
-import RendererLogger from "../../lib/RendererLogger";
-
-const logger=new RendererLogger();
 
 const mutations = {
     [LOAD_APPS](state, apps) {
@@ -31,20 +28,22 @@ const actions = {
                 reject();
             });
         });
-    },    
-    newRequest({dispatch,
+    },
+    newRequest({
+        dispatch,
         commit
     }, payload) {
         return new Promise((resolve, reject) => {
-            BeetDB.apps.where('apphash').equals(payload.apphash).modify({next_hash: payload.next_hash}).then(() => {            
-            dispatch('loadApps');
-            commit(NEW_REQUEST, payload);
-            resolve();
-        }).catch((e) => {
-            logger.log(e);
-            reject();
+            BeetDB.apps.where('apphash').equals(payload.apphash).modify({
+                next_hash: payload.next_hash
+            }).then(() => {
+                dispatch('loadApps');
+                commit(NEW_REQUEST, payload);
+                resolve();
+            }).catch((e) => {
+                reject(e);
+            });
         });
-    });
     },
     addApp({
         commit
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index 47cd7184..91d8c05c 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -1,12 +1,14 @@
 import Vue from 'vue/dist/vue.js';
-import {defaultLocale} from '../../config/i18n.js'
+import {
+    defaultLocale
+} from '../../config/i18n.js'
 const LOAD_SETTINGS = 'LOAD_SETTINGS';
 
 
 const mutations = {
     [LOAD_SETTINGS](state, settings) {
         Vue.set(state, 'settings', settings);
-    } 
+    }
 };
 
 const actions = {
@@ -20,7 +22,7 @@ const actions = {
 
                     commit(LOAD_SETTINGS, JSON.parse(settings));
                 } else {
-                    
+
                     localStorage.setItem("settings", JSON.stringify(initialState.settings));
                     commit(LOAD_SETTINGS, JSON.parse(initialState.settings));
                 }
diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index 57f37218..8027d211 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -13,17 +13,14 @@ const SET_WALLET_STATUS = 'SET_WALLET_STATUS';
 const SET_WALLET_UNLOCKED = 'SET_WALLET_UNLOCKED';
 const SET_WALLETLIST = 'SET_WALLETLIST';
 const REQ_NOTIFY = 'REQ_NOTIFY';
-import RendererLogger from "../../lib/RendererLogger";
-
-const logger=new RendererLogger();
 
 const wallet = {};
 
 
 const mutations = {
     [GET_WALLET](state, wallet) {
-        
-       
+
+
         Vue.set(state, 'wallet', wallet);
     },
     [CONFIRM_UNLOCK](state) {
@@ -66,12 +63,13 @@ const actions = {
                 commit(GET_WALLET, wallet);
                 resolve();
             } catch (e) {
-                logger.log(e);
                 reject();
             }
         });
     },
-    confirmUnlock({commit}) {
+    confirmUnlock({
+        commit
+    }) {
         commit(CONFIRM_UNLOCK);
     },
     saveWallet({
@@ -84,7 +82,7 @@ const actions = {
                 let newwallet = {
                     id: walletid,
                     name: payload.walletname,
-                    chain: payload.walletdata.chain, 
+                    chain: payload.walletdata.chain,
                     accounts: [payload.walletdata.accountID]
                 };
                 if (!wallets) {
@@ -163,7 +161,7 @@ const initialState = {
     walletlist: [],
     ipc: ipcRenderer,
     unlocked: {},
-    isUnlocked:false
+    isUnlocked: false
 };
 
 export default {
diff --git a/src/translations/common/en.json b/src/translations/common/en.json
index e27076db..025bad5a 100644
--- a/src/translations/common/en.json
+++ b/src/translations/common/en.json
@@ -37,7 +37,7 @@
     "confirm_pass_error": "Passwords do not match.",
     "balances_lbl": "Balances",
     "error_lbl": "Error",
-    "node_lbl": "Node:",    
+    "node_lbl": "Node:",
     "link_alert": "App: `{{appName}}` from `{{origin}}` wants to link to a {{chain}} chain. Please create or unlock the appropriate wallet.",
     "access_alert": "App: `{{appName}}` from `{{origin}}` wants to interact with linked account {{chain}}:{{account_id}}. Please create or unlock the appropriate wallet."
 }
\ No newline at end of file

From bbdb8c9235c890c15cb3a6606820f66149099315 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Sun, 28 Oct 2018 15:24:34 +0200
Subject: [PATCH 33/35] Init fix after update

---
 src/config/config.js | 4 ++--
 src/index.html       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/config.js b/src/config/config.js
index 53f9eb7f..88debb4c 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,6 +1,6 @@
 export const version = {
-    release: 1,
-    name: '1.0.0beta'
+    release: 2,
+    name: '0.5.0'
 };
 export const chainList = [{
     short: 'BTS',
diff --git a/src/index.html b/src/index.html
index 68258a76..006932d7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -56,7 +56,7 @@
         }).$mount('#app');
 
         BeetServer.initialize(app);
-        BeetServer.open();
+        
 
         window.onerror = function (msg, url, lineNo, columnNo, error) {
             logger.error(error);

From 593b93118d1d1377ecf30f3ec077ab400b73c1a0 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 30 Oct 2018 00:27:42 +0200
Subject: [PATCH 34/35] Fix non-existing unlock promise on first run

---
 src/store/modules/WalletStore.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/store/modules/WalletStore.js b/src/store/modules/WalletStore.js
index 8027d211..75b06735 100644
--- a/src/store/modules/WalletStore.js
+++ b/src/store/modules/WalletStore.js
@@ -92,6 +92,14 @@ const actions = {
                 }
                 wallets.push(newwallet);
                 localStorage.setItem("wallets", JSON.stringify(wallets));
+                let unlock;
+                let unlocked = new Promise(function (resolve) {
+                    unlock = resolve
+                });
+                commit(SET_WALLET_UNLOCKED, {
+                    promise: unlocked,
+                    resolve: unlock
+                });
                 commit(SET_WALLET_STATUS, true);
                 commit(SET_WALLETLIST, wallets);
                 let ls = new SecureLS({

From 5fb0b194ab7ef90722681d248dd3933547d058c2 Mon Sep 17 00:00:00 2001
From: Alex Megalokonomos <alex@clockwork.gr>
Date: Tue, 30 Oct 2018 23:14:14 +0200
Subject: [PATCH 35/35] Test using elliptic

---
 package-lock.json     | 44 ++++---------------------------------------
 package.json          |  2 +-
 src/lib/BeetServer.js | 13 ++++++++-----
 src/lib/BeetWS.js     | 11 +++++++----
 4 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97c9a242..4df170cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1553,12 +1553,6 @@
         "chainsaw": "~0.1.0"
       }
     },
-    "bindings": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
-      "optional": true
-    },
     "bitsharesjs": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/bitsharesjs/-/bitsharesjs-1.8.0.tgz",
@@ -1645,7 +1639,8 @@
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
     },
     "bn.js": {
       "version": "4.11.8",
@@ -2866,24 +2861,6 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "eccrypto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/eccrypto/-/eccrypto-1.0.3.tgz",
-      "integrity": "sha1-pBIObOmLAHLBzqr96tFW9ruLJOM=",
-      "requires": {
-        "elliptic": "^6.0.2",
-        "es6-promise": "^3.0.2",
-        "nan": "^2.1.0",
-        "secp256k1": "^2.0.4"
-      },
-      "dependencies": {
-        "es6-promise": {
-          "version": "3.3.1",
-          "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
-        }
-      }
-    },
     "ecurve": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/ecurve/-/ecurve-1.0.6.tgz",
@@ -6987,7 +6964,8 @@
     "nan": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+      "dev": true
     },
     "natives": {
       "version": "1.1.4",
@@ -8671,20 +8649,6 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
       "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
-    "secp256k1": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-2.0.10.tgz",
-      "integrity": "sha1-x9ajwRnhykQIPDZ7BxXhhJB0F7M=",
-      "optional": true,
-      "requires": {
-        "bindings": "^1.2.1",
-        "bluebird": "^3.0.2",
-        "bn.js": "^4.6.4",
-        "elliptic": "^6.0.2",
-        "nan": "^2.0.9",
-        "object-assign": "^4.0.1"
-      }
-    },
     "secure-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/secure-ls/-/secure-ls-1.2.1.tgz",
diff --git a/package.json b/package.json
index dd82e5ce..36e18182 100644
--- a/package.json
+++ b/package.json
@@ -53,10 +53,10 @@
     "chalk": "^2.4.1",
     "crypto-js": "^3.1.9-1",
     "dexie": "^2.0.4",
-    "eccrypto": "^1.0.3",
     "electron-compile": "^6.4.3",
     "electron-devtools-installer": "^2.2.4",
     "electron-squirrel-startup": "^1.0.0",
+    "elliptic": "^6.4.1",
     "i18next": "^11.6.0",
     "i18next-node-fs-backend": "^2.0.0",
     "otpauth": "^3.2.1",
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index e4d51e64..3e91ce1f 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -2,8 +2,10 @@ import BeetAPI from './BeetAPI';
 import BeetWS from './BeetWS';
 import CryptoJS from 'crypto-js';
 import store from '../store/index.js';
-import eccrypto from 'eccrypto';
-import RendererLogger from "./RendererLogger";
+//import eccrypto from 'eccrypto';
+import { ec as EC } from "elliptic"; 
+var ec = new EC('curve25519');
+import RendererLogger from "./RendererLogger"; 
 
 const logger = new RendererLogger();
 
@@ -14,14 +16,15 @@ const linkHandler = async (req) => {
     try {
         userResponse = await BeetAPI.handler(Object.assign(req, {}), vueInst);
         let apphash = CryptoJS.SHA256(req.browser + ' ' + req.origin + ' ' + req.appName + ' ' + req.payload.chain + ' ' + userResponse.identity.id).toString();
-        let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
+        //let secret = await eccrypto.derive(req.key, Buffer.from(req.payload.pubkey, 'hex'));
+        let secret =req.key.derive(ec.keyFromPublic(req.payload.pubkey, 'hex').getPublic());
         store.dispatch('OriginStore/addApp', {
             appName: req.appName,
             apphash: apphash,
             origin: req.origin,
             account_id: userResponse.identity.id,
             chain: req.payload.chain,
-            secret: secret.toString('hex'),
+            secret: secret.toString(16),
             next_hash: req.payload.next_hash
         });
         let response = Object.assign(req, {
@@ -30,7 +33,7 @@ const linkHandler = async (req) => {
             chain: req.payload.chain,
             next_hash: req.payload.next_hash,
             account_id: userResponse.identity.id,
-            secret: secret.toString('hex')
+            secret: secret.toString(16)
         });
         return response;
     } catch (e) {
diff --git a/src/lib/BeetWS.js b/src/lib/BeetWS.js
index daab286f..fe2eeef5 100644
--- a/src/lib/BeetWS.js
+++ b/src/lib/BeetWS.js
@@ -9,9 +9,11 @@ import {
 const OTPAuth = require("otpauth");
 import CryptoJS from 'crypto-js';
 import crypto from 'crypto';
-import eccrypto from 'eccrypto';
+//import eccrypto from 'eccrypto';
 import Https from 'https';
 import Fs from 'fs';
+import { ec as EC } from "elliptic"; 
+var ec = new EC('curve25519');
 /*
 import RendererLogger from "./RendererLogger";
 const logger = new RendererLogger();
@@ -99,7 +101,7 @@ export default class BeetWS extends EventEmitter {
               "origin": client.origin,
               "appName": client.appName,
               "browser": client.browser,
-              "key": client.pk,
+              "key": client.keypair,
               "type": 'link'
             };
             this.emit('link', linkobj);
@@ -171,8 +173,9 @@ export default class BeetWS extends EventEmitter {
         this._clients[client].otp = otp;
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": true, "account_id": "' + result.app.account_id + '"}}');
       } else {
-        this._clients[client].pk = crypto.randomBytes(32);
-        let pubkey = eccrypto.getPublic(this._clients[client].pk).toString('hex');
+        let keypair= ec.genKeyPair();
+        this._clients[client].keypair = keypair;
+        let pubkey = keypair.getPublic().encode('hex');
         this._clients[client].send('{"id": ' + result.id + ', "error": false, "payload": { "authenticate": true, "link": false, "pub_key": "' + pubkey + '"}}');
       }
     } else {