123
Merge branch 'master' of github.com:iversonliang/GD

Conflicts:
	GD-web/src/main/java/com/GD/web/servlet/AsyncServlet.java
	GD-web/src/main/java/com/GD/web/servlet/BusinessHandleThread.java