merge master

diff --cc consensus/general.go
Simple merge

diff --cc test/tx_test_util.go
Simple merge

diff --cc wallet/annotated.go
index 759e10f,fe05f7b..f0beae1
--- 1/wallet/annotated.go
--- 2/wallet/annotated.go
+++ b/wallet/annotated.go
@@@ -2,10 -2,7 +2,9 @@@ package walle
  
  import (
        "encoding/json"
-       "fmt"
  
 +      btmCommon "github.com/bytom/common"
 +      btmConsensus "github.com/bytom/consensus"
        log "github.com/sirupsen/logrus"
  
        "github.com/vapor/account"