完成集成Webservice的演示
添加邮件集成演示
Merge remote-tracking branch 'remote/master'

Conflicts:
	pom.xml
	src/main/resources/applicationContext.xml
	src/main/webapp/WEB-INF/web.xml