Merge branch 'master' of https://github.com/ControlCoin/Controlcoin
Merge branch 'master' of https://github.com/ControlCoin/Controlcoin