Merge branch 'master' into master

1 files changed, 14 insertions, 3 deletions

diff --git a/src/index.html b/src/index.html
index 6714a9f..b669add 100644
--- a/src/index.html
+++ b/src/index.html
@@ -173,6 +173,13 @@
                             </div>
                         </div>
                         <div class="form-group">
+                            <label for="phrase" class="col-sm-2 control-label">BIP39 Split Mnemonic</label>
+                            <div class="col-sm-10">
+                                <textarea id="phraseSplit" class="phraseSplit private-data form-control" title="Only 2 of 3 cards needed to recover."></textarea>
+                            </div>
+                                                        <div id="phraseSplitWarn" class="phraseSplitWarn"></div>
+                        </div>
+                        <div class="form-group">
                             <label for="passphrase" class="col-sm-2 control-label">BIP39 Passphrase (optional)</label>
                             <div class="col-sm-10">
                                 <textarea id="passphrase" class="passphrase private-data form-control" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
@@ -273,7 +280,10 @@
                                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a>
                                     </label>
                                     <div class="col-sm-10">
-                                        <input id="change-bip44" type="text" class="change form-control" value="0">
+                                        <div class="input-group">
+                                          <input id="change-bip44" type="text" class="change form-control" value="0">
+                                          <a class="default-bip44-change-value btn btn-primary input-group-addon" role="button">Default</a>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -923,6 +933,9 @@
         <script src="js/bitcoinjs-3.3.2.js"></script>
         <script src="js/bitcoinjs-extensions.js"></script>
         <script src="js/bitcoinjs-bip38-2.0.2.js"></script>
+        <script src="js/groestlcoinjs-3.3.2.js"></script>
+        <script src="js/groestlcoinjs-bip38-2.0.2.js"></script>
+        <script src="js/elastos-1.0.9.min.js"></script>
         <script src="js/segwit-parameters.js"></script>
         <script src="js/ethereumjs-util.js"></script>
         <script src="js/ripple-util.js"></script>
@@ -945,7 +958,5 @@
         <script src="js/entropy.js"></script>
         <script src="js/stellar-util.js"></script>
         <script src="js/index.js"></script>
-        <script src="js/groestlcoinjs-3.3.2.js"></script>
-        <script src="js/groestlcoinjs-bip38-2.0.2.js"></script>
     </body>
 </html>