no message
no message
no message
update documents
add document
no message
no message
no message
no message
no message
no message
no message
Merge branch 'gh-pages' into version2.1.2

* gh-pages:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  add document
  update documents
  no message
  no message
  no message

Conflicts:
	.classpath
	.gitignore
	README.md
	bin/com/jg/main/file/JGFileHandler.class
	bin/com/jg/main/loader/JGMainServletContextListener.class
	bin/com/jg/util/JGDrawingUtils.class
	bin/com/jg/util/JGFileUtils.class
	doc/javaScript/classes/JGService.html
	doc/javaScript/data.json
	doc/javaScript/index.html
	js/JGService.2.1.1.js
	js/yuidoc.json
	logo.png
	src/com/jg/action/JGAction.java
	src/com/jg/action/handler/JGMultipartData.java
	src/com/jg/action/handler/JGMultipartDefaultUploadHandler.java
	src/com/jg/action/handler/JGMultipartUploadHandlerDef.java
	src/com/jg/action/handler/JGResponseWriter.java
	src/com/jg/action/handler/JGService.java
	src/com/jg/action/handler/JGServiceBox.java
	src/com/jg/action/handler/JGServiceFilter.java
	src/com/jg/action/handler/JGServiceHandler.java
	src/com/jg/action/handler/JGServiceKey.java
	src/com/jg/action/handler/JGServiceMap.java
	src/com/jg/main/JGHttpServlet.java
	src/com/jg/main/JGKeyword.java
	src/com/jg/main/JGMainConfig.java
	src/com/jg/main/JGServletDefaultErrorHandler.java
	src/com/jg/main/JGServletErrorHandlerDef.java
	src/com/jg/main/file/JGFileHandler.java
	src/com/jg/main/loader/JGMainLoader.java
	src/com/jg/main/loader/JGMainServletContextListener.java
	src/com/jg/util/JGDrawingUtils.java
	src/com/jg/util/JGFileUtils.java
	src/com/jg/util/JGReflectionUtils.java
	src/com/jg/util/JGServletUtils.java