Gritter
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	assets/cache/137647217981fd783c6cebb794adc2ba21b61c348d.css
	assets/cache/13764799337b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/137665162781fd783c6cebb794adc2ba21b61c348d.css
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	assets/cache/1376547925c87e99010a1d07308f249d1a39a130c6.js
Database
Order Complete
Inventory and reports bugs fixed