Render product details
Update images
Merge branch 'master' into feature-2

Conflicts:
	frontend/app/templates/products.hbs