Merge branch 'develop' into feed
comments #2 - better seperation between bookmark and feeds

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