Merge branch 'master' into swing

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
fix classpath
Merge remote-tracking branch 'origin/swing' into swing-oracle
swing登录界面
修改JDBC参数
Merge pull request #5 from wdxzs1985/swing-oracle

Swing oracle
移除swing界面
Merge pull request #7 from wdxzs1985/web

Web
取消合并
reset HEAD