Merge branch 'master' into master

diff --cc src/index.html
Simple merge

diff --cc src/js/bitcoinjs-extensions.js
index 255ac86f773c964414522d859a224fc2a2da24d6,b6d2de68a0729fad813d1dd155b4c9440afead14..4536783b877b903bff5e3639261d4727f33e771a
--- 1/src/js/bitcoinjs-extensions.js
--- 2/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1717,13 -1717,13 +1717,24 @@@ bitcoinjs.bitcoin.networks.aryacoin = 
    wif: 0x97
  };
  
 +bitcoinjs.bitcoin.networks.thought = {
 +  messagePrefix: 'unused',
 +  bip32: {
 +    public: 0xFbC6A00D,
 +    private: 0x5AEBD8C6
 +  },
 +  pubKeyHash: 0x07,
 +  scriptHash: 0x09,
 +  wif: 0x7B
 +};
++
+ bitcoinjs.bitcoin.networks.elastos = {
+     messagePrefix: 'unused',
+     bip32: {
+         public: 0x0488B21E,
+         private: 0x0488ADE4,
+     },
+     pubKeyHash: 0x21,
+     scriptHash: 0xc4, // TODO set this correctly, same as BTC for now
+     wif: 0xef // TODO set this correctly, same as BTC for now
+ };

diff --cc src/js/index.js
Simple merge