Merge branch 'master' into fork_rebase

* master:
  remove reorg state when the blockchain forking
  fix blockchain fork chain validate header error

# Conflicts:
#	processor/validator.go