new branch
webapp source
Merge branch 'master' into web

Conflicts:
	java/org/qq4j/core/QQHttpClient.java
	java/org/qq4j/core/QQUserManager.java
merge from master
Merge pull request #5 from wdxzs1985/swing-oracle

Swing oracle
移除swing界面
add ignore
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
Merge pull request #7 from wdxzs1985/web

Web
取消合并
reset HEAD