Fix bugs
Merge branch 'master' of https://github.com/jgat2012/ADT
e
Conflicts:
	application/controllers/inventory_management.php
	application/views/sections/link.php