changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php
changes
changes
Maps
Changes
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/views/sections/link.php
Bug in dispensing
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/sections/link.php
Drug Id updates
changes
changes
changes
changes
Settings
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	Export/(Labels).pdf
	application/views/sections/link.php
Regimen settings
changes