Sync Message
Delete
Counties
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
Dispensing
Merge branch 'master' of https://github.com/jgat2012/ADT
Dispensing Issues
cache
Changes in inventory(delivered orders)
adherence issues
changes
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/report_management.php
Reports
Commodity Summary
Drug consumption balance
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	assets/cache/13769936997b0bbd27a4acf15a38e2865ca72cbe4f.css
	dassets/cache/13771135647b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13776143217b0bbd27a4acf15a38e2865ca72cbe4f.css
Facility Consumption Summary
Reports
Reports