switch to Rails 4.0.0
link bookmarks to user
Merge branch 'first-changes'

merge to allow for rails version change
bookmarks shown only for current user
Merge branch 'first-changes'