Added master-master filter of tasks
Merge branch 'development' of https://github.com/BaobabHealthTrust/DDE2 into development