latest changes, F-CDRR validation
Merge branch 'master' of https://github.com/annchemu/HCMPv2

Conflicts:
	application/controllers/rtk_management.php
	application/views/rtk/rtk/lab_commodities_v.php