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

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

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

Conflicts:
	CSS/style.css
	application/controllers/report_management.php
Edit Dispense
Dispense Details
Edit Patient
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
	application/controllers/dispensement_management.php
	application/controllers/report_management.php
Changes
Fix dispensing
Patient Details
Merge branch 'master' of https://github.com/jgat2012/ADT
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	CSS/style.css
	application/views/login_v.php
	application/views/sections/head.php
	application/views/template.php