first commit
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
This are changes that were made by Jack
Seth 1
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
this is an edited version of htacesss
latest changes made to date
evaluation charts made
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/views/facility/facility_orders/facility_order_from_kemsa_v.php
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
analysis complete
new analysis complete

Signed-off-by: mesAdima <mesadima@gmail.com>
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
facility mapping fix
Raw Data pop up done
analysis new
Merge branch 'master' of https://github.com/MesAdima/HCMP-version2