fix testnet
Merge branch 'master' into develop
add neutrino gravity wave for difficulty recalculation
add neutrino gravity wave for difficulty recalculation