Nieuw 2
Merge branch 'master' of https://github.com/Snapmedia/Deal42

Conflicts:
	product.phtml