Creating template
Use openshift ENV variables
Merge branch 'master' of ssh://emserver1-noop.rhcloud.com/~/git/emserver1

Conflicts:
	.openshift/action_hooks/post_start_ruby-1.9
	.openshift/action_hooks/post_stop_ruby-1.9
Removed unused files