Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/controllers/orders.php
	application/controllers/rtk_management.php
	application/models/commodities.php
	application/models/facility_stocks.php
	application/views/rtk/rtk/dpp/dpp_home_with_table.php
	application/views/rtk/rtk/dpp/lab_commodities_report_edit_v.php
	application/views/rtk/rtk/dpp/rtk_allocation_v.php
	application/views/rtk/rtk/dpp/rtk_orders_listing_v.php
CHanges latest
Changes Galore
Changes
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	.htaccess
	application/controllers/home_controller.php
	application/controllers/rtk_management.php
	application/controllers/user_management.php
	application/models/user.php
Merge branch 'master' of https://github.com/ttunduny/HCMPv3

Conflicts:
	application/controllers/cd4_management.php
	application/controllers/eid_management.php
	application/controllers/home.php
	application/controllers/home_controller.php
	application/controllers/issues.php
	application/controllers/kenya.php
	application/controllers/national.php
	application/controllers/orders.php
	application/controllers/reports.php
	application/controllers/rtk_management.php
	application/controllers/rtk_management1.php
	application/controllers/sms.php
	application/controllers/stock.php
	application/controllers/user_management.php
	application/models/commodities.php
	application/models/facilities.php
	application/models/facility_issues.php
	application/models/facility_stocks.php
	application/models/users.php
	application/views/facility/facility_home_v.php
	application/views/facility/facility_issues/facility_redistribute_items_confirmation_v.php
	application/views/facility/facility_orders/facility_order_from_kemsa_v.php
	application/views/national/dashboard.php
	application/views/rtk/allocation_committee/ajax_view/rtk_county_allocation_datatableonly_v.php
	application/views/rtk/allocation_committee/allocation_non_reported.php
	application/views/rtk/allocation_committee/zone_b.php
	application/views/rtk/rtk/admin/admin_users.php
	application/views/rtk/rtk/admin/home_v.php
	application/views/rtk/rtk/clc/home.php
	application/views/rtk/rtk/clc/rca_sidabar.php
	application/views/rtk/rtk/partner/partner_dashboard.php
	application/views/rtk/rtk/partner/side_menu.php
	application/views/rtk/rtk/partner/side_menu_filter.php
	application/views/rtk/rtk/scmlt/fcdrr.php
	application/views/shared_files/login_pages/login_v.php
	application/views/subcounty/reports/facility_mapping_v.php