Mac changes

Conflicts:
SuperCoin-qt.pro