new branch
Oracle版本
Merge remote-tracking branch 'origin/master' into swing-oracle

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

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml