comments #36 - edit event, with reminder

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'event' into develop