完成来源管理
Merge branch 'master' of git@github.com:jeasonyoung/examw-test.git

Conflicts:
	src/main/resources/spring-examw-test-service.xml