Edit Dispensing
Some minor changes
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Dispense Template
template
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/template.php
Merge branch 'master' of https://github.com/KevinMarete55443/ADT