merge dashboardMaster into dev

diff --cc package-lock.json
Simple merge

diff --cc package.json
index 3d6e576,3ae0588..e814414
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -87,7 -88,7 +87,8 @@@
    ],
    "dependencies": {
      "babel-polyfill": "~6.16.0",
 +    "babel-register": "~6.22.0",
+     "bignumber.js": "^7.2.1",
      "bootstrap-sass": "~3.3.7",
      "btoa": "^1.1.2",
      "classnames": "~2.2.5",

diff --cc src/features/app/components/Container.jsx
index 7e59787,f867e35..494ad63
--- 1/src/features/app/components/Container.jsx
--- 2/src/features/app/components/Container.jsx
+++ b/src/features/app/components/Container.jsx
@@@ -103,9 -121,9 +119,9 @@@ class Container extends React.Componen
      } else if (!this.props.configured) {
        layout = <Config>{this.props.children}</Config>
      } else if (!this.props.configKnown) {
 -      return <Loading>{lang === 'zh'?  '正在连接到Bytom Core...' : 'Connecting to Bytom Core...'}</Loading>
 +      return <Loading>{t('welcome.connect')}</Loading>
      } else if (!this.props.accountInit && this.state.noAccountItem){
-       layout = <Register>{this.props.children}</Register>
+       layout = <Config>{this.props.children}</Config>
      } else{
        layout = <Main>{this.props.children}</Main>
      }

diff --cc src/locales/en/translation.json
index d39e887,1707fdf..59ba938
--- 1/src/locales/en/translation.json
--- 2/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@@ -304,20 -306,13 +306,25 @@@
      "keyPlaceholder":"Please enter the key alias...",
      "passwordPlaceholder":"Please enter the key password...",
      "repeatPlaceHolder":"Please repeat the key password...",
-     "errorTitle":"Error in initialization"
+     "errorTitle":"Error in initialization",
+     "mnemonic":"mnemonic",
+     "mnemonicRequire":"Mnemonic is Required",
+     "create": "Create Wallet",
+     "createDescription":"This option will create a default account, key password and give you a option to keep you mnemonic.  Warning: key seed words will display only once, it's important to remember your password.",
+     "welcome":"Welcome to Bytom __network__"
    },
 +  "welcome":{
 +    "connect":"Connecting to Bytom Core...",
 +    "join":"Joining network",
 +    "joining":"Joining network...",
 +    "title":"Configure Bytom Core",
 +    "mainnetTitle":"Join the Bytom Mainnet",
 +    "mainnetMsg":"For common users to enter. Mainnet is the production network, that carry real Bytom transactions.",
 +    "testnetTitle":"Join the Bytom Testnet",
 +    "testnetMsg":"For developers or bytom testers to enter. Testnet is an alternative Bytom blockchain, and to be used for testing.",
 +    "solonetTitle":"Create the Bytom Soloent",
 +    "solonetMsg":"For users/developers to run and test wallet's new function. Solonet is a private sandbox blockchain network."
 +  },
    "backup":{
      "title":"Backup and Restore",
      "backup":"Back Up",

diff --cc src/locales/zh/translation.json
index 6170e5c,ac1176d..84aa078
--- 1/src/locales/zh/translation.json
--- 2/src/locales/zh/translation.json
+++ b/src/locales/zh/translation.json
@@@ -303,20 -305,13 +305,25 @@@
      "keyPlaceholder":"请输入密钥别名...",
      "passwordPlaceholder":"请输入密钥密码...",
      "repeatPlaceHolder":"请重复输入密钥密码...",
-     "errorTitle":"初始化错误"
+     "errorTitle":"初始化错误",
+     "mnemonic":"助记词",
+     "mnemonicRequire":"助记词是必须项",
+     "create": "新建钱包",
+     "createDescription":"这个选项将生成默认的挖矿账户和默认密钥。 助记词将会在此生成，您可以选择保留助记词或者跳过。 注意： 助记词只生成一次， 请将密码，助记词妥善保存",
+     "welcome":"欢迎来到__network__"
    },
 +  "welcome":{
 +    "connect":"正在连接到Bytom Core...",
 +    "join":"加入网络",
 +    "joining":"加入网络...",
 +    "title":"配置 Bytom Core",
 +    "mainnetTitle":"加入 Bytom 主网",
 +    "mainnetMsg":"普通用户选择加入。这是实际的Bytom网络，包含真实的交易信息。",
 +    "testnetTitle":"加入 Bytom 测试网络",
 +    "testnetMsg":"开发者选择加入。这是Bytom的测试网络，用于Bytom的相关测试。",
 +    "solonetTitle":"创建 Bytom 单机网络",
 +    "solonetMsg":"创建一个沙盒私有网络供用户运行和测试功能。"
 +  },
    "backup":{
      "title":"备份与恢复",
      "backup":"备份",