merge with collins
finishing merge with collins
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