phpexcel
deleted excel
program commodities
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
Working Live order
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live

Conflicts:
	application/views/facility/facility_orders/facility_order_from_kemsa_v.php
	print_docs/excel/excel_files/Githiga Private Medical Clinic_facility_order_no_192_date_created_05-09-14.xls
ignore
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