Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigurk-develop

Conflicts:
	rpc/api.go

rpc/api.go

@@ -106,7 +106,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 
-		*reply = api.xethAtStateNum(args.BlockNumber).TxCountAt(args.Address)
+		count := api.xethAtStateNum(args.BlockNumber).TxCountAt(args.Address)
+		*reply = common.ToHex(big.NewInt(int64(count)).Bytes())
 	case "eth_getBlockTransactionCountByHash":
 		args := new(GetBlockByHashArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {