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