Merge branch 'master' into swing

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
fix classpath
Merge remote-tracking branch 'origin/swing-oracle' into oracle
ORACLE干净版本
Merge remote-tracking branch 'origin/swing' into swing-oracle