Resolves merge conflicts.
Resolves merge conflicts.
Merge branch 'master' into stef
Merge branch 'master' into stef
Adds second table to Invitations page for open events responded to.
Merge branch 'master' into shehryar
Cleans up edit form and adds headings to finalise form
Merge branch 'master' into stef