new content
Merge branch 'master' of https://github.com/photon-infotech/java-webservice-eshop

Conflicts:
	.phresco/phresco-load-test-info.xml
	.phresco/phresco-performance-test-info.xml