Inventory and reports bugs fixed
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/views/template.php
	assets/cache/13767346197b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13770872456b643dd89797e523514f23999360dbd5.js
Merge branch 'master' of https://github.com/jgat2012/ADT
Dispensing Issues