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
Merge pull request #340 from Jedwondle/master

This should catch all import add/updates.
various changes
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SearchServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SearchService.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/service/Search.java
changes to solr search
Merge pull request #341 from gebagley/master

solr changes with articles, refactoring
fixing a misspelling in browser so the script will work
Merge pull request #342 from blaine-O/master

fixing a misspelling in browser so the script will work
Container testing and login tweaks
Merge branch 'master' of https://github.com/di2e/openstorefront