no message
Merge branch 'master' of https://github.com/kiennd/bookstore

Conflicts:
	BookStore/WebContent/header.jsp
	BookStore/WebContent/topNavBar.jsp