program commodities
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
Merge branch 'master' of https://github.com/MesAdima/HCMPv2

Conflicts:
	application/controllers/reports.php
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
consumption data AMC included
Before merge with Seth
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2
Potential Expiries Report changes
Expiries Graph fix
fixed amc data on consumption graph
merge with collins
Consumption
expiries table data and download fixed
Amc Query
merge with collins
Merge branch 'master' of https://github.com/MesAdima/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks.php
	application/views/subcounty/ajax/county_consumption_data_filter_v.php
some changes
New Expiries Table Data and Download
Stock Outs Reports
Stock Outs Reports and Expiries Report. Edited the Excel Sheet