Added a quick fix for a typo
Almost done getting rid of bugs on configuration tool.
Merge required to merge with master.
Fixing an error with the merge.
Merge branch 'master' of https://github.com/Jedwondle/openstorefront into Jedwondle-master

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/ComponentRESTResource.java
Merge branch 'Jedwondle-master'