adds bookmarks, fixes bugs in entries view where publishe ddate is nil
more bookmarks fixing
fixed origin merge conflicts and bugs
fixed pull conflicts