Fixed variation tests
SONATA-301 - Added category listing on product catalog
Merge pull request #39 from Bladrak/categoryListing

SONATA-301 - Added category listing on product catalog
Fixed error occuring when loading ArrayCollection productCategories
Merge pull request #40 from Bladrak/fixingErrorOnArrayCollectionCategories

Fixed error occuring when loading ArrayCollection productCategories
SONATA-308 - Add "add to basket" to be handled in popin

Move JS code + add option to product provider

Fix template

Rename modal option

Add ajax verification
Updated basket element qty error
SONATA-195 - Implemented Bootstrap3
Added page titles to ecommerce pages
Merge pull request #46 from Bladrak/pageTitles

Added page titles to ecommerce pages
Merge pull request #38 from eko/basketpopin

SONATA-308 - Add "add to basket" to be handled in popin
SONATA-307 - Added filtering system to product catalog
Merge branch 'develop' into SONATA-307

Conflicts:
	src/Sonata/ProductBundle/Controller/CatalogController.php
Merge pull request #42 from Bladrak/SONATA-307

Added filtering system to product catalog
Merge pull request #37 from Bladrak/fixVariationTests

Fixed variation tests
Merge branch 'develop' into SONATA-195

Conflicts:
	src/Sonata/BasketBundle/Resources/views/Basket/add_product_form.html.twig
Merge pull request #45 from Bladrak/SONATA-195

SONATA-195 - Implemented Bootstrap3
Fixing failing unit test (incorrect status)
Fixing functional tests by implementing KnpPaginationBundle
Merge pull request #47 from Bladrak/fixedTests

Implemented KnpPaginationBundle in catalog (& fixed tests)