add function to delete shop product
Merge remote-tracking branch 'shoptalk/master'

Conflicts:
	application/controllers/ShopController.php