MarcHelper#edition_str, too hard to deal with html_safety and include html tags in return val, straight text
Merge branch 'master' of github.com:team-umlaut/umlaut
search_controller_test, test for number of results equal to page size

In my environment, these tests were failing, cause I got 20 hits
back for each search (page size), but tests were for less?!? Not
sure why Travis succeeded, let's see if this breaks travis.
have to explictly require jquery-rails in plugin dummy test env, to make it work right
search_controller_test results test for >=1, to work wtih both mock and real data
merge master
fix test to match new citation block