Fix genesis json
Merge branch 'develop' into btsx
Fix genesis json
Update fork block num