Merge pull request #1 from KevinMarete/master

Monday 1/9/2014 7:16 PM-Test Pull Request
db password
Patient Consumption Report Issues
1.Removed all zeros replaced with blank spaces
2.If not oi drugs dispensed do not show patient in list
Add Category to TB section so that when patient is selected if
 they have TB (if category 1 then intensive is 3 months range,continuation is 112 days range),
category 2 is intensive is 3 months range and continuation 5 months)
Merge branch 'master' of https://github.com/wambuimungai/ADT
tb category added
1.tb_category column added to auto_management script
2.merged add,edit patient forms from eunice
Merge branch 'EuniceManyasi-master'
pmtct to art start regimen/date
Deleted viral load
Merge branch 'master' of https://github.com/KevinMarete/ADT
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 'master' of https://github.com/KevinMarete/ADT