Merge pull request #1 from KevinMarete/master

Monday 1/9/2014 7:16 PM-Test Pull Request
db password
Merge branch 'master' of https://github.com/wambuimungai/ADT
pmtct to art start regimen/date
Patient Consumption Report
1.Removed CTX from listing
When dispensing, if patient is no longer pregnant, change type of service to ART
Recheck how age is calculated, round is not working
Errors for Patient without Status Change date
1.Should not show people with transit status.
2.Edited fmap template submit button to 'submit report'
Merge pull request #2 from jgat2012/master

Dispensing, Change PMTCT patients to ART when no longer pregnant
Change log
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge pull request #3 from jgat2012/master

Change log file
Merge branch 'master' of https://github.com/wambuimungai/ADT into wambuimungai-master

Conflicts:
	application/views/edit_patients_v.php
	application/views/sections/link.php
	assets/viral_load.json
Merge branch 'wambuimungai-master'
database pwd
Fixed fmaps total number of new and revisit patients summary
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge pull request #5 from jgat2012/master

Fmaps calculation
TB Datepicker
1.Fixed range period selector on both add & edit patient
Fmaps, total number of patients of patients on ART only