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

Conflicts:
	BookStore/WebContent/index.jsp
	BookStore/WebContent/topNavBar.jsp
	BookStore/build/classes/DAO/AuthorDAO.class
	BookStore/build/classes/DAO/BookDAO.class
	BookStore/build/classes/DAO/DBConnection.class
	BookStore/build/classes/DAO/OrderDAO.class
	BookStore/build/classes/DAO/UserDAO.class
	BookStore/build/classes/control/backend/BookAction.class
	BookStore/build/classes/model/Cart.class
	BookStore/build/classes/model/Order.class
	BookStore/src/DAO/BookDAO.java
	BookStore/src/DAO/DBConnection.java
	BookStore/src/DAO/OrderDAO.java
	BookStore/src/control/frontend/CheckoutAction.java