user_management & report_management changes
Merge branch 'master' of https://github.com/jgat2012/ADT
changes
updates
Latest changes
Routine refill bug fixed
Changelog
viralload
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	changelog.txt
changes
changes
Fmaps
system update
Facility Dashboard, Fmaps Fix
changes on report_mangement
Latest changes
reportmanagement change
template and patient model changes
changes