update
Merge branch 'master' of https://github.com/zhkumu/spring.git

Conflicts:
	src/applicationContext.xml
	src/controller/Main.java
	src/test/Test.java
Merge branch 'master' of https://github.com/zhkumu/spring.git
update