Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SystemServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SystemService.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/IntegrationResource.java
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #404 from dshurt/master

STORE-230   High Article Content Indexing