Merge branch 'master' into ella-support

diff --combined src/js/index.js
index 6428aa7bec17d39fb84e3cbb1ad59ef17450be94,67dde1c25ff0c534c86b86574841a40221a4ef94..8dd553dccb42807098cb6ede650644533a51e329
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -919,7 -919,7 +919,8 @@@
                      || (networks[DOM.network.val()].name == "EXP - Expanse")
                      || (networks[DOM.network.val()].name == "CLO - Callisto")
                      || (networks[DOM.network.val()].name == "DXN - DEXON")
 +                    || (networks[DOM.network.val()].name == "ELLA - Ellaism")
+                     || (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
                  ) {
                      var privKeyBuffer = keyPair.d.toBuffer(32);
                      privkey = privKeyBuffer.toString('hex');
@@@ -1979,14 -1979,6 +1980,14 @@@
                  setHdCoin(78);
              },
          },
 +        {
 +            name: "ELLA - Ellaism",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(163);
 +            },
 +        },
          {
              name: "EMC2 - Einsteinium",
              onSelect: function() {
@@@ -2001,6 -1993,14 +2002,14 @@@
                  setHdCoin(151);
              },
          },
+         {
+             name: "ESN - Ethersocial Network",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(31102);
+             },
+         },
          {
              name: "ETC - Ethereum Classic",
              segwitAvailable: false,

diff --combined tests/spec/tests.js
index 6c9809104860ba7831eb44588d57855ab8f0ad8e,83fc949bc990b1c1ca7cf13497d4a763542d4cc2..88c91a32da03bdda59d1f24b1da898d776496d47
--- 1/tests/spec/tests.js
--- 2/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -1434,13 -1434,13 +1434,20 @@@ it('Allows selection of DEXON', functio
      };
      testNetwork(done, params);
  });
 +it('Allows selection of Ellaism', function(done) {
 +    var params = {
 +        selectText: "ELLA - Ellaism",
 +        firstAddress: "0xa8B0BeA09eeBc41062308546a01d6E544277e2Ca",
 +    };
 +    testNetwork(done, params);
 +});
+ it('Allows selection of Ethersocial Network', function(done) {
+     var params = {
+         selectText: "ESN - Ethersocial Network",
+         firstAddress: "0x6EE99Be2A0C7F887a71e21C8608ACF0aa0D2b767",
+     };
+     testNetwork(done, params);
+ });
  
  // BIP39 seed is set from phrase
  it('Sets the bip39 seed from the prhase', function(done) {