program commodities
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
consumption data AMC included
fixed amc data on consumption graph
merge with collins
expiries table data and download fixed
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
New Expiries Table Data and Download