Added more fields to accomodate npid assignments
Added more methods in Master and tests to work with npid assignments
Merge branch 'master' of https://github.com/BaobabHealthTrust/DDE2