Solr stup
Merge remote-tracking branch 'upstream/master'
Use Solr