Fixed conflicts
Fixed MetadataIntegrationTest so that it can load all metadata packages and added ignored test to demonstrate program updating problem
major changes
* Addition of concepts uuid in dictionary class
* Addition of encounter types and Identifier types in metadata class
* modification of getmothers method in the patientutils
* Inclusion of child care summary information
* adjustiments of forms with concepts
formatting outputs
Merge branch 'master' of github.com:I-TECH/openmrs-module-kenyaemr
Added new patient-list reports to the MCHMS program.
Fixed misleading comment
Added calculation test
Registration app additions
* County
*Province
*Division
*Plot Number
Added calculation test
Merge branch 'master' of github.com:I-TECH/openmrs-module-kenyaemr
Addition of person attribute
*Added subchief field
*added metadata package
Updating the zipped package
Addition of getters and setters for person attribute
Minor code improvements
Some more code improvements for efficiency and clarity
Removed uneccessary imports.
Added ui velocity function provider with resourceLink function for generating paths to UI resources
Updated to latest kenyaui 1.12.4
Added JS in MCHMS enrollment form to improve UX and data quality.