Vaadin 7

Change-Id: I7038cb65be4f3d94bf3c08fdc0b1368c720beee0