Creating template
Merge remote-tracking branch 'openshift/master'

merged openshift/github repo
merged the openshift repo