Merge pull request #164 from eko/2.3-develop

SONATA-338 - Fix products grid rendering + fix "add to basket" popin to ...
SONATA-357 - Update fixtures to link products with category
Merge pull request #165 from eko/fixtures

SONATA-357 - Update fixtures to link products with parent category
SONATA-349 - Fix demonstration bar wording