修改回复匹配逻辑
Merge branch 'master' into swing-oracle

Conflicts:
	.settings/org.eclipse.wst.common.component