certain change with Solr
get up to date
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/resources/openstorefront.properties
solr model change
more solr changes
Merge branch 'master' of https://github.com/di2e/openstorefront
missing field in solr needed fixing
solr fixes
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge branch 'master' of https://github.com/di2e/openstorefront
Put the search back to 'client' mode.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #337 from Jedwondle/master

Put the search back to client mode.
Merge pull request #338 from blaine-O/master

Minor correction.  It's all green (pass) this morning on storefront1.
Added the solar delete for indexes, and an API call to clearSolr.
Merge pull request #339 from Jedwondle/master

Added the solar delete for indexes, and an API call to clearSolr.
This should catch all import add/updates.
Merge pull request #340 from Jedwondle/master

This should catch all import add/updates.
various changes