fixed typo in family controller
Merge branch 'master' into creating_child_calendar_view