Creating template
Merge remote-tracking branch 'openshift/master'

Conflicts:
	.openshift/action_hooks/start
	.openshift/action_hooks/stop