Creating template
getting ready to be deployed into openshift
Merge remote-tracking branch 'openshift/master'
fix typo