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

Conflicts:
	application/controllers/user_management.php
Reports
Merge branch 'master' of https://github.com/jgat2012/ADT