Update for hardfork
Merge branch 'master' of https://github.com/syscoin/syscoin

Fix to merge and updates from others.