Merge branch 'master' into master

diff --cc src/index.html
Simple merge

diff --cc src/js/index.js
index b98d9794542168a11403b27cb799fe99421f7b20,9ace962612267c779c264895031634ae3ca9ee74..23eaa4700e4ce016dab4c5d13211d9d1d27e6c06
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -1630,22 -1711,6 +1704,23 @@@
          return DOM.bip32tab.hasClass("active");
      }
  
 +    function networkIsEthereum() {
 +        var name = networks[DOM.network.val()].name;
 +        return (name == "ETH - Ethereum")
 +                    || (name == "ETC - Ethereum Classic")
++                    || (name == "EWT - EnergyWeb")
 +                    || (name == "PIRL - Pirl")
 +                    || (name == "MIX - MIX")
 +                    || (name == "MUSIC - Musicoin")
 +                    || (name == "POA - Poa")
 +                    || (name == "EXP - Expanse")
 +                    || (name == "CLO - Callisto")
 +                    || (name == "DXN - DEXON")
 +                    || (name == "ELLA - Ellaism")
 +                    || (name == "ESN - Ethersocial Network")
 +                    || (name == "VET - VeChain")
 +    }
 +
      function networkHasSegwit() {
          var n = network;
          if ("baseNetwork" in network) {