fixed drug management issues on drug supervision entries;
Merge branch 'development' of https://github.com/BaobabHealthTrust/bart2 into development