test
Merge branch 'spring' of https://github.com/zhoufeng001/myhessian-app
into spring

Conflicts:
	target/classes/META-INF/maven/com.zf.myhessian/myhessian-app/pom.properties