Merge of graadin-plugin and grails-vaadin-plugin