fixed editProfile bugs, fixed FamilyProfileFragment bugs, fully connected the family tree to the network
merge commit