Rebase Mazacoin-Qt

These are the changes for Mazacoin-Qt.