Merge branch 'develop' into event
comments #36 - reminder to event

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