Creating template
play2 sample app for openshift
Merge branch 'master' of ssh://10.34.56.54/~/git/play2

Conflicts:
	.openshift/action_hooks/start
	.openshift/action_hooks/stop
	README.md
build
start