added recent changes to test and lab config files
Merge branch '2.5_KENYA_DEV' of github.com:ilabafrica/BLIS into 2.5_KENYA_DEV

Conflicts:
	htdocs/catalog/specimen_type_new.php
	htdocs/catalog/test_category_new.php
	htdocs/catalog/test_type_new.php
	htdocs/includes/page_elems.php