Merge remote-tracking branch 'origin/master'

Conflicts:
	website/pages/home.html

config.json

@@ -104,7 +104,7 @@
 
     "daemon": {
         "host": "127.0.0.1",
-        "port": 18081
+        "port": 42081
     },
 
     "wallet": {

website/config.js

@@ -6,7 +6,7 @@ var irc = "irc.freenode.net/#poolhost";
 
 var email = "support@poolhost.com";
 
-var cryptonatorWidget = ["XMR-BTC", "XMR-USD", "XMR-EUR"];
+var cryptonatorWidget = ["XDN-BTC", "XDN-USD", "XDN-EUR"];
 
 var easyminerDownload = "https://github.com/zone117x/cryptonote-easy-miner/releases/";
 
@@ -14,4 +14,4 @@ var blockchainExplorer = "http://chainradar.com/{symbol}/block/{id}";
 
 var transactionExplorer = "http://chainradar.com/{symbol}/transaction/{id}";
 
-var themeCss = "themes/default-theme.css";
+var themeCss = "themes/default-theme.css";

website/pages/home.html

@@ -34,7 +34,7 @@
     }
     #calcHashResultsHolder{
         min-width: 145px;
-        max-width: 200px;
+        max-width: 145px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;