Merge branch 'develop' into bitshares
Update checkpoint
Merge branch 'bitshares' of github.com:BitShares/bitshares into bitshares
Fix chain id