Merge origin/master
Conflicts:
	amasoon/src/main/webapp/bookDetails.xhtml
	amasoon/src/main/webapp/resources/cart.xhtml
	amasoon/src/main/webapp/resources/header.xhtml