Resolves merge conflicts.
Resolves merge conflicts.
Adds second table to Invitations page for open events responded to.
Merge branch 'master' into shehryar