stock fix
Merge branch 'development' of github.com:mxaGianluca/stylesuite_dev into development

Conflicts:
	beheer/cms/classes/controller/shop/products.php