Tomcat 7 adjustments
merge from master
Service Updates
STORE-181 Tomcat 7
Tomcat 7 adjustments
Changed to have log files saved once for each day and then individual files (with HH-MM) saved within those folders.  If you run multiple x per day they are all saved in the same folder with different timestamps.
Merge pull request #165 from Jedwondle/master

Adjusted the workflow for view and storage models and fleshed out the component service.
fixing merge
fixing merge
Changing name of log files directory from 'screenshots' to 'automation_logs'
minor script tweaks, they show as indiscernible between pass and fail.
Old resulst file
Changing names to make it easier to read in the log files (broke some screenshots?)  Added WESS POC (Proof of Concept)
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