Gadget Store Inventory
Merge branch 'master' of https://github.com/globeestate11/estate

Conflicts:
	application/controllers/order.php