RPC重新发布

RPC重新发布
Merge branch 'master' of https://github.com/niniwzw/macoin

Conflicts:
	src/bitcoinrpc.cpp