Updated solr config and image server config
Merge branch 'master' into banjoprops
Merge branch 'master' into banjoprops
Merge pull request #276 from nla/banjoprops

Banjoprops