Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Resolved
new changes
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/divisional_reports.php
	application/controllers/reports.php
	application/models/facility_stocks.php fix
	application/views/facility/facility_reports/ajax/facility_expiry_filter_v.php
	application/views/subcounty/reports/county_stock_level_filter_v.php
merge with collins
finishing merge with collins
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/config/database.php
	application/controllers/reports.php
	application/models/districts.php
	application/models/facility_stocks.php fix
	application/views/subcounty/reports/county_stock_level_filter_v.php
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/views/subcounty/reports/county_stock_level_filter_v.php
mos fix
Merge branch 'master' of https://github.com/MesAdima/HCMP-version2

Conflicts:
	application/controllers/reports.php
	application/views/subcounty/reports/county_stock_level_filter_v.php
fix
Merge with Jack