Upgrade to Vaadin 7