更新
Merge branch 'master' of https://github.com/zy198804065/github.test.git

Conflicts:
	servlet_spring4_hibernate_anno/.project