Creating template
Merge pull request #2 from elemento15/development

Change index
Merge remote-tracking branch 'openshift/master'
Changes for Openshift