Component Importer
Updated component base data
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/ComponentRESTResource.java
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentQuestionView.java
Merge pull request #237 from dshurt/master

Master
Preparing for OpenAM login page.
Merge pull request #238 from blaine-O/master

Preparing for OpenAM login page.