nb
Merge branch 'master' of https://github.com/mupengfei/ShareServer

Conflicts:
	src/com/jesse/share/servlet/InitServlet.java
dfd
Merge branch 'master' of https://github.com/mupengfei/ShareServer

Conflicts:
	WebRoot/WEB-INF/config/GlobalConfig.properties
Merge branch 'master' of https://github.com/mupengfei/ShareServer

Conflicts:
	src/log4j2.xml