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

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