Inventory bincard
Report Changes
Iventory updates
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/template.php