Fixed behat tests according to new fixtures
Merge branch '2.3-develop' into fixingBehatTests

Conflicts:
	features/frontend/shop/basket.feature
Merge pull request #215 from Bladrak/fixingBehatTests

Fixed behat tests according to new fixtures