reverting commit
push test
Delete solr
Merge branch 'master' into HEAD