fixed district error
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Commits
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
fixed redistribution
redistribute
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live into develop
morning
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live

Conflicts:
	application/controllers/orders.php
	application/controllers/reports.php
	application/controllers/sms.php
	application/views/facility/facility_issues/facility_redistribute_items_v.php
	print_docs/excel/excel_files/Githiga Private Medical Clinic_facility_order_no_158_date_created_20-08-14.xls
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live
Order and Redistribution fix
Expiries
RTK Changes and Task 1 and 2 from Sheila
Revert "RTK Changes and Task 1 and 2 from Sheila"

This reverts commit 96772c4ec3882a2295dbb1fe2e182e068d7376cb.