Removed the dups.
Merge branch 'master' of https://github.com/di2e/openstorefront
trying to sync github with my local copy
Merge branch 'master' of https://github.com/dshurt/openstorefront into dshurt

Conflicts:
	server/openstorefront/openstorefront-web/pom.xml
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/BaseEntity.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/ComponentReviewCon.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/LookupEntity.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/util/OpenStorefrontConstant.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/AttributeCodeView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentDetail.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentEvaluationSchedule.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/SearchResult.java
	server/openstorefront/openstorefront-web/src/test/java/edu/usu/sdl/openstorefront/test/DataConvertTest.java
Testing git workflow