new tests
add tests
Merge branch 'master' of https://github.com/XiongZhijun/study

Conflicts:
	spring-mvc/.classpath