Settings updates
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Patient Adherence
settings updates
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/views/template.php
Stock Consumption
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	CSS/style.css
	application/views/patient_listing_v.php
Disclosure
Disclosure
Disclosure
Disclosure
Merged with Marete
Style changes
Family Planning
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
Merge branch 'master' of https://github.com/KevinMarete55443/ADT