Search functionality with filters
started working on checkout
test1
Merge pull request #7 from mzaharie/master

shippingAddress
start cart
composer update
cart view from database
update view
Cart finished
composer modified
update cart
Inserted Success & Error messages
Improved security for Cart management system
finished cart
solved a bug with the cart update
Merge pull request #10 from ahusar/master

composer update
Merge branch 'master' into search

Conflicts:
	src/Bookshop/BookshopBundle/Resources/config/routing.yml
	src/Bookshop/BookshopBundle/Resources/views/Default/category.html.twig
Merge pull request #8 from ahusar/search

Search functionality with filters
Merge branch 'master' into cart

Conflicts:
	.gitignore~
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/config/security.yml
	composer.json
	composer.lock
	src/Bookshop/BookshopBundle/Controller/CartController.php
	src/Bookshop/BookshopBundle/Entity/User.php
	src/Bookshop/BookshopBundle/Menu/Builder.php
	src/Bookshop/BookshopBundle/Resources/config/routing.yml
	src/Bookshop/BookshopBundle/Resources/config/services.yml
	src/Bookshop/BookshopBundle/Resources/translations/BookshopBundle.en.yml
	src/Bookshop/BookshopBundle/Resources/translations/BookshopBundle.ro.yml
	src/Bookshop/BookshopBundle/Resources/views/Cart/index.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Default/homepage.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Profile/edit.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Profile/show.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Registration/checkEmail.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Registration/confirmed.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Registration/register.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Resetting/request.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Resetting/reset.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Security/login.html.twig
	src/Bookshop/BookshopBundle/Resources/views/dashboardLayout.html.twig
	src/Bookshop/BookshopBundle/Resources/views/layout.html.twig
	src/Bookshop/BookshopBundle/Resources/views/layout3Cols.html.twig
Merge pull request #11 from ahusar/cart

Cart