Change to the attributes made this change necessary.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #206 from Jedwondle/master

Quick change to GA user id information.
Merge pull request #207 from Jedwondle/master

Added the correct scores for the JView component.
Store-172 attribute/architecture import/service
Finished api, and importer
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #208 from dshurt/master

Master
Merge branch 'master' of https://github.com/di2e/openstorefront
Changing to internet explorer momentarily to see if Jenkins will handle this.
NOTE that Firefox quit working on my machine mid-day.  Also that Win7/ IE11 does not work unless you have 32-bit drivers, but giving it a try in Jenkins anyway.
Merge pull request #209 from blaine-O/master

Changing autom browser to IE for Jenkins
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/AttributeService.java