Replaced groups with events
Merge branch 'master' of https://github.com/jenniferchen/pkup