template and patient model changes
notification changes
notification management changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
report management changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
lost to follow up changes
maretes
Merge branch 'master' of https://github.com/KevinMarete/ADT
pending edit/addpatient
bootbox changes
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge branch 'master' of https://github.com/jgat2012/ADT
pending add/editpatient
changes
lost to follow up changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
changes:ordering has no duplicates
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json