Product model

Product model
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	site/models/product.php