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

Conflicts:
	Scripts/Merged_JS.js
Report Final
Reports bugs fix
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Reports and Dashboard
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/report_management.php
Expiring and expired drugs reports
Auto SMS Notification for Patients
Notifications Tab
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/report_management.php
New Orders
Order Management
Styling orders
Merge branch 'master' of https://github.com/KevinMarete55443/ADT