修改配置文件
Merge branch 'master' of https://github.com/shmilbin1570/example

Conflicts:
	showcase/src/main/resources/spring/applicationContext.xml