changes to product categories function
Merge branch 'master' of https://github.com/ConnorHolyday/SellMyGadgets

Conflicts:
	application/controller/ProductController.php
	application/model/ProductModel.php