跳转
Merge branch 'master' of git@github.com:jqyou/libRecommendSys.git

Conflicts:
	WebContent/html/BookList.html
	WebContent/html/BookSearch.html