phpexcel
deleted excel
Added the Switch back to Current Month Feature
Added the Change back to Current Month Feature on the CLC and RTK admin, linked the rtk main page graph with the database to get percentages
Changes to Color schemes on the FCDRR
Changes
program commodities
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
no message
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
changed
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
no message
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/controllers/rtk_management.php
	application/views/rtk/lab_commodities_v.php
	application/views/rtk/rtk/dashboard_view.php
	application/views/rtk/rtk/dpp/lab_commodities_report_edit_v.php
	application/views/rtk/rtk/rca/home.php
	application/views/rtk/rtk/rca/trend.php
	rtk_monthly_reports.bat