Updated MOH257 so that 'next appointment date' can't be before encounter date (https://www.pivotaltracker.com/story/show/61956366)
Merge pull request #75 from ningosi/master

Spouse relationship type added
Disabled MSM option in PwP section for non-male patients (https://www.pivotaltracker.com/story/show/61956486)
Added button icons to 'edit relationship' form
Redefined 'currently in care' indicators on MOH731 to only consider HIV encounters (https://www.pivotaltracker.com/story/show/60227286)
Added <recentObs> tag to display recent recordings on HFE forms and updated the Triage and Clinical Encounter form to use it
Added localization of remaining concepts on registration form (https://www.pivotaltracker.com/story/show/53586737)
Updated metadatadeploy to 0.2
Fixed mchmsPreventiveServices validation to ensure next date must be later than date. See PT story: https://www.pivotaltracker.com/story/show/61803310
Merge pull request #76 from gitahi86/master

Improved mchmsPreventiveServices Validation
Fixed bug in WhoStageAtArtStartCalculation causing CalculationResult to be given a value for the WHO Stage obs even when NULL/UNKNOWN is saved in the database. See PT story: https://www.pivotaltracker.com/story/show/62142144
Fixed concept MCHMS concept-related issues. See PT story https://www.pivotaltracker.com/story/show/62147552
Merge branch 'master' of github.com:I-TECH/openmrs-module-kenyaemr

Merged with upstream.
Merge pull request #77 from gitahi86/master

Fixed CalculationResult Bug in WhoStageAtArtStartCalculation + Fixed Concepts
Additions to MOH257 (https://www.pivotaltracker.com/story/show/62142254)
Rework reporting and calculations based medication taking
* onMedication replaced by medicationDispensed which looks for dispensing records between dates
* onCtxProphylaxis looks at specific CTX concepts
* Added new concepts for CTX/INH prophylaxis to MOH257
Updated kenyacore to 0.16.1
Added toast message when HFE form submission comes back with errors (https://www.pivotaltracker.com/story/show/62235572)
Updated PwP fields on MOH257 to allow NO responses
Improved HIV and common calculation unit tests
* Use TestUtils.getPatient consistently
* Removed unnecessary session flushes
* Increased coverage