bassel qa is afgerond
BASSEL Qa af

Conflicts:
	Magento/skin/frontend/default/default/css/styles.css