Settings background hover color
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
Fixed bug in Dispensing. Dose when choosing routine refill
Changelog
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	assets/viral_load.json