Latest changes
Routine refill bug fixed
Changelog
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	changelog.txt
changes
changes
Fmaps
Latest changes
template and patient model changes
changes
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/views/sections/link.php
	assets/cdrr_aggregate.xls
	assets/cdrr_satellite.xls
	assets/cdrr_stand_alone.xls
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/views/sections/link.php
Merge branch 'master' of https://github.com/jgat2012/ADT
changes
changes
notification changes
changes
changes
changes
changes