Creating template
Github merge with Openshift :)
Merge remote-tracking branch 'openshift/master'
beta EMS