Creating template
Merge branch 'master' of ssh://mangiare-genepian.rhcloud.com/~/git/mangiare into openshift

Merge with openshift