Bug in regimen and drugs merging fixed
manual and bootbox
Merge branch 'master' of https://github.com/jgat2012/ADT