Creating template
Merge remote-tracking branch 'openshift/master'
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed