Dwh audit reviews:Added PNS as a strategy for HTS initial and retesting, added facility to be referred and date to be enrolled in referral and linkage removed prep app in kenyaemr common - to remove dependancies

.gitattributes

@@ -0,0 +1,75 @@
+* text=auto
+
+# Known text file extensions
+*.as text
+*.bat text
+*.cnf text
+*.conf text
+*.css text
+*.csv text
+*.dtd text
+*.erb text
+*.ftl text
+*.gitattributes text
+*.gitignore text
+*.gitkeep text
+*.gitmodules text
+*.groovy text
+*.gsp text
+*.htaccess text
+*.htm text
+*.html text
+*.java text
+*.js text
+*.js.withjstl text
+*.json text
+*.jsp text
+*.list text
+*.lock text
+*.log text
+*.markdown text
+*.md text
+*.nsh text
+*.nsi text
+*.opts text
+*.php text
+*.pl text
+*.policy text
+*.pp text
+*.project text
+*.properties text
+*.rb text
+*.rdf text
+*.scss text
+*.sh text
+*.sql text
+*.story text
+*.svg text
+*.tag text
+*.tld text
+*.txt text
+*.vm text
+*.xml text
+*.xsl text
+*.xslt text
+*.yaml text
+*.yml text
+
+# Known binary file extensions
+*.bmp binary
+*.chls binary
+*.class binary
+*.db binary
+*.eot binary
+*.exe binary
+*.gif binary
+*.gzip binary
+*.ico binary
+*.jar binary
+*.jpeg binary
+*.jpg binary
+*.omod binary
+*.png binary
+*.ttf binary
+*.woff binary
+*.zip binary

api/pom.xml

@@ -1,17 +1,27 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>kenyaemr</artifactId>
-		<version>15.1.8-RC2-SNAPSHOT</version>
+		<version>17.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kenyaemr-api</artifactId>
-    <version>15.1.8-RC2-SNAPSHOT</version>
+    <version>17.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>KenyaEMR Module API</name>
 	<description>API project for KenyaEMR Module</description>
-
 	<build>
 		<pluginManagement>
 			<plugins>

api/src/main/distro/metadata/concepts.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Concepts used by KenyaEMR, listed A-Z -->
 <refs type="Concept">
 	<ref key="ABACAVIR" uuid="70056AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -7,14 +18,16 @@
 	<ref key="ADULT_INPATIENT_SERVICE" uuid="160536AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ALBENDAZOLE" uuid="70439AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ANTENATAL_CASE_NUMBER" uuid="161655AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="ANTENATAL_NUMBER" uuid="163530AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ANTIRETROVIRAL_DRUGS" uuid="1085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ANTIRETROVIRAL_TREATMENT_START_DATE" uuid="159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ANTIRETROVIRAL_USE_IN_PREGNANCY" uuid="1147AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ANTIRETROVIRAL_USED_IN_PREGNANCY" uuid="966AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="APGAR_SCORE_AT_1_MINUTE" uuid="159603AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="APGAR_SCORE_AT_5_MINUTES" uuid="159604AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="APGAR_SCORE_AT_10_MINUTES" uuid="159605AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="BACILLE_CAMILE_GUERIN_VACCINATION" uuid="886AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="APGAR_SCORE_AT_1_MINUTE" uuid="159603AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="APGAR_SCORE_AT_5_MINUTES" uuid="159604AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="APGAR_SCORE_AT_10_MINUTES" uuid="159605AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="AUNT" uuid="975AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="BACILLE_CAMILE_GUERIN_VACCINATION" uuid="886AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="BREASTFED_EXCLUSIVELY" uuid="5526AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="CD4_COUNT" uuid="5497AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="CD4_PERCENT" uuid="730AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -41,7 +54,7 @@
 	<ref key="DATE_TRANSFERRED_OUT" uuid="160649AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DAYS" uuid="1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DEFAULTED" uuid="160031AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="DELIVERY_ASSISTANT" uuid="1573AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="DELIVERY_ASSISTANT" uuid="1573AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DETECTED" uuid="1301AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DEVELOPMENTAL_MILESTONES" uuid="162069AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DIDANOSINE" uuid="74807AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -52,6 +65,7 @@
 	<ref key="DISEASE_DIAGNOSED" uuid="1661AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DISEASE_SUSPECTED" uuid="142177AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DIVORCED" uuid="1058AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="DRIVER" uuid="159466AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="DURATION_UNITS" uuid="1732AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="EDUCATION" uuid="1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="EFAVIRENZ" uuid="75523AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -61,14 +75,19 @@
 	<ref key="EXPECTED_DATE_OF_DELIVERY" uuid="5596AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="EXPOSURE_TO_HIV" uuid="822AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="EQUIVOCAL" uuid="1300AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="ESTIMATED_MATERNAL_BLOOD_LOSS_QUALITATIVE" uuid="162092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="ESTIMATED_MATERNAL_BLOOD_LOSS_QUALITATIVE" uuid="162092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FAMILY_PLANNING" uuid="160653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FAMILY_MEMBER" uuid="1560AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FARMER" uuid="1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="FATHER" uuid="971AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FLUCONAZOLE" uuid="76488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FREE_TEXT_GENERAL" uuid="160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="FULLY_IMMUNIZED_CHILD" uuid="164134AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GRANDFATHER" uuid="160273AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GRANDMOTHER" uuid="159772AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GRANDPARENT" uuid="973AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="GRAVIDA" uuid="5624AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GUARDIAN" uuid="160639AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="HEIGHT_CM" uuid="5090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="HEPATITIS_B" uuid="111759AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="HEPATOTOXICITY" uuid="159098AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -93,6 +112,7 @@
 	<ref key="INDICATION_FOR_TB_PROPHYLAXIS" uuid="162276AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="INHIBITORY" uuid="1303AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="Initial_World_Health_Organization_HIV_stage" uuid="160553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="IN_SCHOOL" uuid="5629AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ISONIAZID" uuid="78280AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ISONIAZID_DISPENSED" uuid="162230AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ISONIAZID_PREVENTIVE_THERAPY_PROGRAM" uuid="29453c24-fbc6-4872-9708-8010eab6a6f0"/>
@@ -105,14 +125,15 @@
 	<ref key="MARRIED_MONOGAMOUS" uuid="5555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MARRIED_POLYGAMOUS" uuid="159715AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MATERNAL_AND_CHILD_HEALTH_PROGRAM" uuid="159937AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="MATERNAL_CONDITION_DURING_PUERPERIUM" uuid="162093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="MEASLES_RUBELLA_VACCINE" uuid="162586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="MEASLES_VACCINATION" uuid="36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="MATERNAL_CONDITION_DURING_PUERPERIUM" uuid="162093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="MEASLES_RUBELLA_VACCINE" uuid="162586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="MEASLES_VACCINATION" uuid="36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MEDICATION_ORDERS" uuid="1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MEDICATION_DURATION" uuid="159368AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="METHOD_OF_DELIVERY" uuid="5630AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="METHOD_OF_DELIVERY" uuid="5630AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="METHOD_OF_ENROLLMENT" uuid="160540AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="METHOD_OF_FAMILY_PLANNING" uuid="374AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="MOTHER" uuid="970AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MOTHER_ON_ANTIRETROVIRAL_DRUGS_AND_BREASTFEEDING" uuid="159941AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MOTHER_ON_HAART" uuid="1149AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="MOTHER_ON_PROPHYLAXIS" uuid="1148AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -122,9 +143,12 @@
 	<ref key="MYCROBACTERIUM_TUBERCULOSIS_EXTRAPULMONARY" uuid="5042AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NATURAL_FAMILY_PLANNING" uuid="5277AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NEGATIVE" uuid="664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="NEONTAL_RESUSCITATION" uuid="162131AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="NEONTAL_RESUSCITATION" uuid="162131AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NEVER_MARRIED" uuid="1057AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NEVIRAPINE" uuid="80586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GRANDFATHER" uuid="160273AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="GRANDMOTHER" uuid="159772AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="NEXT_OF_KIN_RELATIONSHIP" uuid="1560AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NUTRITIONAL_STUNTING" uuid="164085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="LAMIVUDINE" uuid="78643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="LAMIVUDINE_NEVIRAPINE_ZIDOVUDINE" uuid="1652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -137,30 +161,34 @@
 	<ref key="NOT_ASSESSED" uuid="160737AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NOT_DETECTED" uuid="1302AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="NOT_HIV_TESTED" uuid="1402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-	<ref key="NUTRITIONAL_SUPPORT" uuid="5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />	
+	<ref key="NUTRITIONAL_SUPPORT" uuid="5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="OCCUPATION" uuid="1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ON_TREATMENT_FOR_DISEASE" uuid="1662AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="OPTION_B_PLUS_PROGRAM" uuid="162226AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="ORPHAN" uuid="1174AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="OTHER_NON_CODED" uuid="5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="OVERALL_TREATMENT_ADHERENCE" uuid="164075AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="PARENT" uuid="1527AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PARITY" uuid="1053AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PARITY_ABORTION" uuid="1823AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PARITY_TERM" uuid="160080AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PARTNER_HIV_STATUS" uuid="1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="PARTNER" uuid="163565AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PARTNER_OR_SPOUSE" uuid="5617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PATIENT_OUTCOME" uuid="160433AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PATIENT_REPORTED_CURRENT_TUBERCULOSIS_PROPHYLAXIS" uuid="1110AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PEDIATRIC_INPATIENT_SERVICE" uuid="160537AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PERIPHERAL_NEUROPATHY" uuid="118983AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="POLIO_VACCINATION_INACTIVATED" uuid="1422AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="POLIO_VACCINATION_ORAL" uuid="783AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-	<ref key="PYRIDOXINE" uuid="82912AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />	
+	<ref key="PYRIDOXINE" uuid="82912AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="LOCATION_OF_BIRTH"  uuid="1572AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="PARTNER" uuid="163565AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PMTCT_PROGRAM" uuid="160538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PNEUMOCOCCAL_CONJUGATE_VACCINE" uuid="162342AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="POSITIVE" uuid="703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="POOR_SAMPLE_QUALITY" uuid="1304AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-    <ref key="PREGNANCY_DURATION_AMOUNT" uuid="1789AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="PREGNANCY_DURATION_AMOUNT" uuid="1789AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PREGNANCY_STATUS" uuid="5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PRIMARY_EDUCATION" uuid="1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="PROBLEM_ADDED" uuid="6042AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -170,7 +198,7 @@
 	<ref key="REASON_FOR_PROGRAM_DISCONTINUATION" uuid="161555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="REASON_ELIGIBLE_FOR_ART" uuid="162225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="REFERRED_FROM" uuid="160481AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-	<ref key="REFERRED_TO" uuid="163145AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />	
+	<ref key="REFERRED_TO" uuid="163145AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="REFERRING_CLINIC_OR_HOSPITAL" uuid="159371AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="RELAPSE_SMEAR_POSITIVE_TUBERCULOSIS" uuid="159877AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="REPLACEMENT_FEEDING" uuid="1595AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -185,10 +213,13 @@
 	<ref key="SCHEDULED_VISIT" uuid="1246AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SECONDARY_EDUCATION" uuid="1714AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SEXUAL_ABSTINENCE" uuid="159524AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="SIBLING" uuid="972AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SIGN_SYMPTOM_NAME" uuid="1728AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SIGN_SYMPTOM_PRESENT" uuid="1729AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="SPOUSE" uuid="5617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SITE_OF_TUBERCULOSIS_DISEASE" uuid="160040AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="STAVUDINE" uuid="84309AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="STUDENT" uuid="159465AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SMEAR_POSITIVE_NEW_TUBERCULOSIS_PATIENT" uuid="159878AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SULFAMETHOXAZOLE_TRIMETHOPRIM" uuid="105281AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="SPUTUM_FOR_ACID_FAST_BACILLI" uuid="307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -211,6 +242,7 @@
 	<ref key="TUBERCULOSIS_TREATMENT_OUTCOME" uuid="159786AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="TUBERCULOSIS_TREATMENT_PROGRAM" uuid="160541AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="TYPE_OF_TB_PATIENT" uuid="159871AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key="UNCLE" uuid="974AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
 	<ref key="UNDER_FIVE_CLINIC" uuid="160544AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="UNIVERSITY_COMPLETE" uuid="160300AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="UNKNOWN" uuid="1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
@@ -232,4 +264,10 @@
 	<ref key="YEARS" uuid="1734AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="YELLOW_FEVER_VACCINE" uuid="5864AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
 	<ref key="ZIDOVUDINE" uuid="86663AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-</refs>
+	<ref key="IPT_PROGRAM" uuid="164128AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+	<ref key="FRIEND" uuid="5618AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+	<ref key="CO_WORKER" uuid="160237AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key= "ARV_TREATMENT_PLAN_EVENT_CONCEPT" uuid ="1255AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key= "START_DRUGS" uuid="1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+	<ref key= "TB_TREATMENT_PLAN_CONCEPT" uuid="1268AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
+</refs>

api/src/main/distro/metadata/forms.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Forms used by KenyaEMR, listed A-Z -->
 <refs type="Form">
 	<ref key="CLINICAL_ENCOUNTER" uuid="e958f902-64df-4819-afd4-7fb061f59308" />

api/src/main/distro/metadata/identifierTypes.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Patient identifier types used by KenyaEMR, listed A-Z -->
 <refs type="IdentifierType">
 	<ref key="CWC_NUMBER" uuid="1dc8b419-35f2-4316-8d68-135f0689859b" />

api/src/main/distro/metadata/programs.xml

@@ -1,3 +1,14 @@
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
 <!-- Programs used by KenyaEMR, listed A-Z -->
 <refs type="Program">
 	<ref key="HIV" uuid="dfdc6d40-2f2f-463d-ba90-cc97350441a8" />

api/src/main/java/org/openmrs/module/kenyaemr/ArtAssessmentMethod.java

@@ -1,17 +1,12 @@
 /**
- * The contents of this file are subject to the OpenMRS Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://license.openmrs.org
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
  */
-
 package org.openmrs.module.kenyaemr;
 
 /**