presenatie commit
Merge branch 'Sjoerd'

Conflicts:
	Resources/ui/common/product/productDetail/ProductDetailView.js
yryt