Srallen events

merge events and invites