Building out 'Members' and 'Invitations' areas
Merge remote-tracking branch 'origin/master'