测试分支提交
测试
Merge remote-tracking branch 'origin/kamBranch' into kamBranch

Conflicts:
	mclient/src/main/java/TestBranch.java