regen fee and merge mining hardfork height
Merge branch 'dev-staging' of https://github.com/syscoin/syscoin into dev-staging