Minor changes
Changes prescribed by Phillip
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/RufusMbugua/ADT
database
dispensing changes
Dispense Management
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Conflicts:
	assets/cache/13754417330b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137555514628432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13758741718b2db8a989fca9d7a2b48449da4f7073.js
	assets/cache/137587475928432daf53b10f0aedc7bf6db22457d6.css
	assets/cache/13759107360b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/137591073628432daf53b10f0aedc7bf6db22457d6.css