added solr container
merge conflicts resolve
Merge branch 'greenkey-feature/solr'