Changes to productsModel
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	site/models/product.php
Merge branch 'testing' of https://github.com/KBarros2014/TEAMB into testing