Merge branch 'master' of https://github.com/MesAdima/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_orders.php
Stocking Level Default graph fixed


Signed-off-by: karsanrichard <karsanrichard@gmail.com>
County System Usage graph fixed
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2_live

Conflicts:
	application/controllers/reports.php
	application/models/facility_orders.php
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge branch 'master' of https://github.com/MesAdima/HCMPv2

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

Conflicts:
	application/controllers/reports.php