front, product page moved buttons
Merge branch 'testing'

Conflicts:
	web/css/style.min.css