Change-Id: I13025715ae133d74270859daa2093b956d755490
Merge branch 'master' of https://github.com/li5220008/spring2.5.git

Conflicts:
	README.md

Change-Id: Ic2eb7cd3c4f0c132784b4139e928e205f594360c


Change-Id: Ibd751df56b09e1fbf76f5b8f53bf8edf71b233b5


Change-Id: I548191ce6572a4932f6f59e11350ade8be8d402a


Change-Id: I2845317d864ee8a5279456b67adcc0915593c17c