Mark's solr stack

merge in Mark's solr stack