addproduct
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/product.php
	testclass/producttest.php