Merge branch 'develop' into notes
comments #9 - basic note view

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