Merge branch 'develop' into notifications
comments #36 - archive and restore notifications

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