Added merge handling logic as well as fine-tuned filters to filter voided records
Made some additions to accomodate record merging
Merge branch 'development' of https://github.com/BaobabHealthTrust/DDE2 into development