system update
Facility Dashboard, Fmaps Fix
Minor changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/controllers/order.php
	application/views/sections/link.php
	assets/cdrr_aggregate.xls
	changelog.txt
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/sections/link.php
changes
lost to follow up changes
maretes
Merge branch 'master' of https://github.com/KevinMarete/ADT
changes
Settings background hover color
Merge branch 'master' of https://github.com/KevinMarete/ADT

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

Conflicts:
	assets/viral_load.json