Creating template
Merge remote-tracking branch 'openshift/master'
Test
Test
Test
Test
Test
Test
Test
Test
Test
Add Java 7 marker