Merge branch 'master' of https://github.com/MesAdima/HCMP-version2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks_temp.php
Merge branch 'master' of https://github.com/MesAdima/HCMP-version2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks_temp.php
Merging
 branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks_temp.php
fixed edit facility stocks error