Renamed /views/bookmarks/*.rhtml to *.html.erb
Merge branch 'rails4' of https://github.com/macluo/expertiza into rails4