Merge branch 'develop' into event
comments #36 - create event, archive and restore

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
comments #36 - edit events

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