Correct the search engine and update masonry plugin
Update the css file for the search engine
Update the tests for the masonry plugin
Merge from master