Add the ability to distinguish between actual family members and people who are related when checking in
Merge remote-tracking branch 'origin/develop' into develop