fixed bugs related to family tree and data caching
Merge branch 'master' of https://github.com/nitzanw/FamilyBox