Drug Id updates
Settings
Merge branch 'master' of https://github.com/jgat2012/ADT

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