bookmarks controller
Merge branch 'hashtags'