additems
Merge remote-tracking branch 'origin/release-1.0' into release-1.0

Conflicts:
	src/main/java/com/kohls/sal/utils/controller/HarnessController.java