fix null pionter
SO MANY NULL POINTERS
add household_uuid
residents and household in upstream sync
dump saving
syncing working
resolved conflict