fix dashboard filtering search engine
Remove solr folder
fix solr
another merge
Merge branch 'erikevans719-master'
amended gemfile.lock