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

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