Revert "BB + CB"

This reverts commit 903e4803532173d6af7c94b299795b4b21dd98c0.
sync
Merge branch 'databasFilter' of https://github.com/DanielAndersson92/BookShop into databasFilter

Conflicts:
	BookExchange_Skel/src/main/webapp/jsf/Secured/addBook.xhtml
merge