Signed-off-by: Free <li5220008@163.com>
Merge branch 'master' of https://github.com/li5220008/spring2.5.git

Conflicts:
	src/beans.xml
	src/junit/test/SpringTest.java

Change-Id: Ib84b149e8d5794a173e6aa0e3edf815bd6712ba0


Change-Id: I0acbc8397dea9a9e61a2bcf6aff5078ca7844006