merging with live system
merging with live system
program commodities graph fixed

Signed-off-by: mesAdima <mesadima@gmail.com>
Added Facility Type to modal
Seth
Signed-off-by: Richard Seth Karsan Through Adima's PC <mesadima@gmail.com>
Merge branch 'master' of https://github.com/MesAdima/HCMPv2

Conflicts:
	application/controllers/reports.php