Mavenized & updated for Vaadin 7 beta 11