Removed unnecessary queries
Fixing conflicts
Added validation methods for adherence and stage defining conditions
Merge branch 'master' of github.com:BaobabHealthTrust/bart2