Updating, add parent or spouse in this ccc
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/controllers/patient_management.php
	application/views/add_patient_v.php
	application/views/patient_details_v.php
	assets/viral_load.json
Editing match spouses.
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/controllers/patient_management.php
	application/views/add_patient_v.php
Merge branch 'master' of https://github.com/KevinMarete/ADT
Dispensing history, change last regimen to current regimen but
keep labelling
Patient details(Add,Edit): When type of service is PEP,
hide drug prophylaxis
Merge pull request #13 from EuniceManyasi/master

When service type is pep hide drug prophylaxis