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
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'