upgrade to vaadin 7