Merge branch 'master' into eosio-support

diff --cc src/js/index.js
index 3b3ebedbf22db8896f9b1a1ee942460f1d3cadfe,7e654346d6c9d1608420ce556676a7994c3c24d7..f54ff71dd3c0baa9f5f0a50bed64c8656648fe8d
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -984,12 -984,7 +984,13 @@@
                  if ((networks[DOM.network.val()].name == "CRW - Crown")) {
                      address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address);
                  }
-                 if (networks[DOM.network.val()].name == "EOS - EOSIO") {
+ 
++              if (networks[DOM.network.val()].name == "EOS - EOSIO") {
 +                    address = ""
 +                    pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
 +                    privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
 +                }
 +                
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
                      hidePending();

diff --cc tests/spec/tests.js
Simple merge