Homepage & Category pages
Merge branch 'master' of https://github.com/pitech-trainers/charlie

Conflicts:
	.gitignore
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/config/routing_dev.yml
	composer.json
	composer.lock
	composer.phar
	src/Bookshop/BookshopBundle/Controller/DefaultController.php
	src/Bookshop/BookshopBundle/Entity/Category.php
	src/Bookshop/BookshopBundle/Entity/Category.php~
	src/Bookshop/BookshopBundle/Menu/Builder.php
	src/Bookshop/BookshopBundle/Resources/config/routing.yml
	src/Bookshop/BookshopBundle/Resources/views/Default/homepage.html.twig
	src/Bookshop/BookshopBundle/Resources/views/Menu/knp_menu.html.twig
	src/Bookshop/BookshopBundle/Resources/views/layout.html.twig
	web/.htaccess
Update .gitignore
remove dump directory
Filter functionality for product page
Merge pull request #2 from ahusar/master

Product Page & Category Page
merged upstream master