merge with collins
some changes
Friday 13th

Signed-off-by: mesAdima <mesadima@gmail.com>
Merge branch 'master' of https://github.com/MesAdima/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks.php
	application/views/subcounty/ajax/county_consumption_data_filter_v.php