commit 05-09
Merge branch 'master' of https://github.com/dayutianfei/chimera.git

Conflicts:
	src/common/java/cn/dayutianfei/common/conf/ChimeraConstant.java