Rejigged party and encounter daos. Partially integrated with encounter fragment. Renamed IdStringPair -> IdNamePair for clarity
Moved table dao tests to correct package