Calculations for patients on Diflucan changed in MAPS
Minor change
Merge branch 'master' of https://github.com/jgat2012/ADT
Merge branch 'master' of https://github.com/KevinMarete/ADT
Minor change
Merge branch 'master' of https://github.com/jgat2012/ADT into jgat2012-master

Conflicts:
	application/views/sections/link.php
Merge branch 'jgat2012-master'