Reports
Merge branch 'master' of https://github.com/jgat2012/ADT
Settings
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/views/indications_v.php