bundles in progress
Merge branch 'master' of https://github.com/b00n24/bookstore

Conflicts:
	src/main/webapp/catalogSearch.xhtml
	src/main/webapp/shoppingCart.xhtml
Merge branch 'master' of https://github.com/b00n24/bookstore