first Solr lab
Merge branch 'mark-dev'