Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	.project
	application/config/database.php
	application/controllers/orders.php
	application/controllers/reports.php
	application/controllers/rtk_management.php
	application/models/commodities.php
	application/models/facilities.php
	application/views/Admin/commodities_v.php
	application/views/facility/facility_issues/facility_redistribute_items_v.php
	application/views/facility/facility_reports/expiries_tracking_chart.php
	application/views/national/reports_v.php
	application/views/rtk/allocation_committee/allocation_pending_v.php
	application/views/rtk/rtk/admin/messages.php
	application/views/rtk/rtk/admin/settings.php
	application/views/rtk/rtk/dpp/dpp_home_with_table.php
	application/views/rtk/rtk/lab_commodities_v.php
	application/views/shared_files/report_templates/side_bar_v.php
	system/libraries/Hcmp_functions.php

Signed-off-by: karsanrichard <karsanrichard@gmail.com>