Merge branch 'master' into master

diff --combined src/js/bitcoinjs-extensions.js
index 21a535acc4577bcba28f02562cdb567e39fa5fb5,3d0c6bd5fc8d4c375c791067fd5f49f19fd5619e..b37f58f5255302fb4bd4f2a199cc4fec58116fe3
--- 1/src/js/bitcoinjs-extensions.js
--- 2/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1616,13 -1616,13 +1616,25 @@@ bitcoinjs.bitcoin.networks.deeponion = 
      wif: 0x9F,
  };
  
++
 +bitcoinjs.bitcoin.networks.cpuchain = {
 +    messagePrefix: 'x18CPUchain Signed Message:\n',
 +    bip32: {
 +      public: 0x0488B21E,
 +      private: 0x0488ADE4,
 +    },
 +    pubKeyHash: 0x1C,
 +    scriptHash: 0x1E,
 +    wif: 0x80,
 +};
++
+ bitcoinjs.bitcoin.networks.wagerr = {
+   messagePrefix: 'unused',
+   bip32: {
+     public: 0x022d2533,
+     private: 0x0221312b
+   },
+   pubKeyHash: 0x49,
+   scriptHash: 0x3f,
+   wif: 0xc7
+ };

diff --combined src/js/index.js
index 704d4e00514138e0f9b71f44419e2e7f58151329,544e67d19e1ba31b1120cc45364796daae01b108..3afa598b39238553cd1dfc926f4ecf82e3660a00
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -1902,13 -1902,6 +1902,13 @@@
                  setHdCoin(71);
              },
          },
 +        {
 +            name: "CPU - CPUchain",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.cpuchain;
 +                setHdCoin(363);
 +            },
 +        },
          {
              name: "CRAVE - Crave",
              onSelect: function() {
@@@ -2748,6 -2741,13 +2748,13 @@@
                  setHdCoin(28);
              },
          },
+         {
+             name: "WGR - Wagerr",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.wagerr;
+                 setHdCoin(7825266);
+             },
+         },
          {
              name: "WC - Wincoin",
              onSelect: function() {

diff --combined tests/spec/tests.js
index f3073129466409578491a840dcbaedcca49605ca,5e65714c96957a42d7582517a9a5e33cbcd4677f..91a9bec33dbac310ec1d67d0dc3aabd1dccca2c9
--- 1/tests/spec/tests.js
--- 2/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -829,13 -829,6 +829,13 @@@ it('Allows selection of Compcoin', func
      };
      testNetwork(done, params);
  });
 +it('Allows selection of CPUchain', function(done) {
 +    var params = {
 +        selectText: "CPU - CPUchain",
 +        firstAddress: "CWWkTPkNRdpTDSfPw7gxUt9cEaC5PSsP3Y",
 +    };
 +    testNetwork(done, params);
 +});
  it('Allows selection of Crave', function(done) {
      var params = {
          selectText: "CRAVE - Crave",
@@@ -1543,6 -1536,13 +1543,13 @@@ it('Allows selection of Stellar', funct
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Wagerr', function(done) {
+     var params = {
+         selectText: "WGR - Wagerr",
+         firstAddress: "WYiVgQU39VcQxcnacoCiaZHZZLjDCJoS95",
+     };
+     testNetwork(done, params);
+ });
  
  // BIP39 seed is set from phrase
  it('Sets the bip39 seed from the prhase', function(done) {