sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Webstore/views/about_product.php