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
Latest Update Fixes
1.Manual Auto Update in settings
2.Added an alert box for drug consumption in settings
3.fixed update for spouses/dependants when ccc_no is changed
4.fixed bug for illnesses listing in edit annd patient details
5.dependent/spouse lost to follow up message
6.changed last regimen label to current regimen
7.when type of service is pep hide prophylaxis
Merge pull request #12 from jgat2012/master

Dependant/Spouse lost to follow up message
Merge pull request #13 from EuniceManyasi/master

When service type is pep hide drug prophylaxis
Eunice Merge Issues