Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	application/controllers/report_management.php
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Dispensing
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
	application/controllers/report_management.php