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

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks_temp.php