0
Merge branch 'master' of https://github.com/dayutianfei/chimera.git

Conflicts:
	conf/chimera.log4j.properties
	src/common/java/cn/dayutianfei/common/conf/ChimeraConstant.java
	src/common/rpc/java/cn/dayutianfei/hadoop/rpc/IRPCHandler.java
	src/common/rpc/java/cn/dayutianfei/hadoop/rpc/RPCResult.java
	src/common/rpc/test/cn/dayutianfei/rpc/test/ClientDemo.java