Fixed Merkle Tree Rebuild
Merge branch 'master' into peercoin