No merchandise box and unauthorised exception
Fixed conflicts with the koesmeister :-1:

Conflicts:
	root/app/View/Products/index.ctp
	root/app/webroot/css/css_styles.css