Products

added supplier drop down
resolved conflict

Conflicts:
	application/modules/supplieragent/controllers/CatalogueController.php