Vaadin 7

Change-Id: Icbebd05062edc6b0c7855381b92401e3164bafbd