Commit 2: Bookstore-core & Bookstore-portlet