Added ajax loading of search results
Added ajax loading of search results
Resolved merge conflicts