Merge branch 'master' into merge_btc010

src/masternodeman.cpp

@@ -699,6 +699,12 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
             // use this as a peer
             addrman.Add(CAddress(addr), pfrom->addr, 2*60*60);
 
+            //doesn't support multisig addresses
+            if(donationAddress.IsPayToScriptHash()){
+                donationAddress = CScript();
+                donationPercentage = 0;
+            }
+
             // add our Masternode
             CMasternode mn(addr, vin, pubkey, vchSig, sigTime, pubkey2, protocolVersion, donationAddress, donationPercentage);
             mn.UpdateLastSeen(lastUpdated);

src/qt/overviewpage.cpp

@@ -154,6 +154,8 @@ OverviewPage::OverviewPage(QWidget *parent) :
 
     if(fMasterNode){
         ui->toggleDarksend->setText("(" + tr("Disabled") + ")");
+        ui->darksendAuto->setText("(" + tr("Disabled") + ")");
+        ui->darksendReset->setText("(" + tr("Disabled") + ")");
         ui->frameDarksend->setEnabled(false);
     }else if(!fEnableDarksend){
         ui->toggleDarksend->setText(tr("Start Darksend Mixing"));

src/qt/res/css/drkblue.css

@@ -961,7 +961,7 @@ margin-top:123px;
 margin-right:5px;
 padding-right:5px;
 font-weight:bold;
-font-size:16px;
+font-size:15px;
 min-height:24px;
 }