整理代码
Merge branch 'develop' of https://github.com/blackcop/WebServiceDemo.git
into develop

Conflicts:
	src/main/resources/applicationContext.xml