Merge branch 'adherence_calculation'
Merge branch 'master' of https://github.com/BaobabHealthTrust/bart2
added extended family planning feature
Merge branch 'master' of https://github.com/BaobabHealthTrust/bart2