dela
add solr
Merge pull request #174 from forumbyr/master

update solr
Merge pull request #6 from cnnic/master

m