Merge branch 'master' into master

diff --cc src/index.html
Simple merge

diff --cc src/js/index.js
index 353f40fca7c0280461da9d58cd3011e94f12d55e,6085f1bb2824c33d27ae22827e0defcb0c0a7905..d822b55a3b27a68924843ec795442c8b463e75a8
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -927,18 -931,15 +931,28 @@@
                      privkey = ethUtil.addHexPrefix(privkey);
                      pubkey = ethUtil.addHexPrefix(pubkey);
                  }
++
 +                // Stellar is different
 +                if (networks[DOM.network.val()].name == "XLM - Stellar") {
 +                    var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
 +                    var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
 +                    var path = "m/";
 +                        path += purpose + "'/";
 +                        path += coin + "'/" + index + "'";
 +                    var keypair = stellarUtil.getKeypair(path, seed);
 +                    indexText = path;
 +                    privkey = keypair.secret();
 +                    pubkey = address = keypair.publicKey();
 +                }
+                 if ((networks[DOM.network.val()].name == "NAS - Nebulas")) {
+                     var NasAccount = require("nebulas-account");
+                     var privKeyBuffer = keyPair.d.toBuffer(32);
+                     var nebulasAccount = new NasAccount();
+                     nebulasAccount.setPrivateKey(privKeyBuffer);
+                     address = nebulasAccount.getAddressString();
+                     privkey = nebulasAccount.getPrivateKeyString();
+                     pubkey = nebulasAccount.getPublicKeyString();
+                 }
                  // Ripple values are different
                  if (networks[DOM.network.val()].name == "XRP - Ripple") {
                      privkey = convertRipplePriv(privkey);