Update code to connect to Solr
Merge branch 'master' of https://github.com/fassetar/Catalog-Demo