Tomcat 7 adjustments
merge from master
Service Updates
STORE-181 Tomcat 7
Tomcat 7 adjustments
fixing merge
fixing merge
fixing merge and adjusting models
fixing merge
fixing merge
committing changes
trying to fix merge
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	.gitignore
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/ComponentServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/UserServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/ComponentService.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/BaseComponent.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/ComponentMedia.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/ComponentTag.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/action/TestAction.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentAttributeView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentDetailView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentExternalDependencyView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentMediaView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentMetadataView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentQuestionView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentResourceView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentReviewView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/SearchResult.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/Component.java
	server/openstorefront/openstorefront-web/src/test/java/edu/usu/sdl/openstorefront/test/DataConvertTest.java
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	.gitignore
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/ComponentServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/UserServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/ComponentService.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/BaseComponent.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/ComponentMedia.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/storage/model/ComponentTag.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/action/TestAction.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentAttributeView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentDetailView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentExternalDependencyView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentMediaView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentMetadataView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentQuestionView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentResourceView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ComponentReviewView.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/SearchResult.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/resource/Component.java
	server/openstorefront/openstorefront-web/src/test/java/edu/usu/sdl/openstorefront/test/DataConvertTest.java
Merge pull request #166 from dshurt/master

Master