event edits
Merge branch 'registration'