some restructure

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
comments #6 - merged the feed and bookmark models

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