front, product page img margin
minified renew
Merge branch 'master' into testing

Conflicts:
	web/css/style.min.css