merging changes
Regimen Drug Settings Fix
1.Could not save drugs to regimen