Fmaps, total number of patients of patients on ART only
Change log file updated
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
Merge pull request #6 from jgat2012/master

Fmaps calculation