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

Conflicts:
	product.phtml
Versie 0.1
Merge branch 'master' of https://github.com/Snapmedia/Deal42