Creating template
Commit from JBoss Tools
Teste
Merge remote-tracking branch 'openshift/master'

Conflicts:
	.gitignore
	README.md