Creating template
Commit from JBoss Tools
Commit from JBoss Tools
initial merge