Merge pull request #235 from blaine-O/master

Minor updates to various scripts.  Looking at how to encrypt UN/PW.
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
Got Question and Answers add/delete working.

Todo, add an EDIT option, and test to make sure the edit/delete are only options for the create user and admin.
Merge pull request #236 from Jedwondle/master

Got Question and Answers add/delete working.
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.