Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	.classpath
	WebRoot/WEB-INF/classes/mblog/service/impl/UserServiceImpl.class
	WebRoot/WEB-INF/web.xml
	jar鍖?/XmlSchema-1.4.5.jar
	jar鍖?/activation.jar
	jar鍖?/antlr-2.7.6.jar
	jar鍖?/asm.jar
	jar鍖?/axis-ant.jar
	jar鍖?/axis.jar
	jar鍖?/c3p0-0.9.1.jar
	jar鍖?/catalina.jar
	jar鍖?/commons-beanutils-1.7.0.jar
	jar鍖?/commons-beanutils-1.8.3.jar
	jar鍖?/commons-codec-1.3.jar
	jar鍖?/commons-collections-3.2.jar
	jar鍖?/commons-digester-1.8.jar
	jar鍖?/commons-discovery-0.2.jar
	jar鍖?/commons-discovery-0.4.jar
	jar鍖?/commons-fileupload-1.2.1.jar
	jar鍖?/commons-lang-2.3.jar
	jar鍖?/commons-logging-1.0.4.jar
	jar鍖?/commons-logging-api-1.1.jar
	jar鍖?/cxf-2.2.2.jar
	jar鍖?/dom4j-1.6.1.jar
	jar鍖?/ezmorph-1.0.6.jar
	jar鍖?/javassist-3.4.GA.jar
	jar鍖?/jaxrpc.jar
	jar鍖?/json-lib-2.4-jdk15.jar
	jar鍖?/jstl.jar
	jar鍖?/jta-1.1.jar
	jar鍖?/log4j-1.2.13.jar
	jar鍖?/log4j-1.2.8.jar
	jar鍖?/mail.jar
	jar鍖?/mailapi_1_3_1.jar
	jar鍖?/mysql-connector-java-5.1.15-bin.jar
	jar鍖?/ognl-2.6.11.jar
	jar鍖?/saaj.jar
	jar鍖?/sitemesh-2.4.jar
	jar鍖?/slf4j-api-1.5.6.jar
	jar鍖?/slf4j-nop-1.5.6.jar
	jar鍖?/tomcat-coyote.jar
	jar鍖?/wsdl4j-1.5.1.jar
	jar鍖?/wsdl4j-1.6.2.jar
	jar鍖?/wss4j-1.5.7.jar
	jar鍖?/xml-apis-2.6.2.jar
	jar鍖?/xmlsec-1.4.2.jar
	jar鍖?/xwork-2.1.2.jar
Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>
Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>