Merge branch 'next' of https://github.com/shines77/spring_mvc3_test into next

Conflicts:
	.gitignore

Signed-off-by: shines77 <gz_shines@msn.com>