Creating template
Merge branch 'master' of ssh://beads3-lelik.rhcloud.com/~/git/beads3

Conflicts:
	.openshift/config/catalina.properties
	.openshift/config/context.xml
	.openshift/config/server.xml
	.openshift/config/web.xml
	README.md
	pom.xml
updated Readme with beads3 details
removed .ServerLifecycleListener from server.xml
added showBasket logic