Inventoryy bugs
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Conflicts:
assets/cache/13759641878b2db8a989fca9d7a2b48449da4f7073.js
	assets/cache/137597300228432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/137647217981fd783c6cebb794adc2ba21b61c348d.css
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Inventory changes
Inventory bugs
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Conflicts:
assets/cache/137647217981fd783c6cebb794adc2ba21b61c348d.css
	assets/cache/137654792581fd783c6cebb794adc2ba21b61c348d.css
	assets/cache/137665162781fd783c6cebb794adc2ba21b61c348d.css
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	assets/cache/1376547925c87e99010a1d07308f249d1a39a130c6.js
Database