Vaadin 7

Change-Id: I5ff733f2f7457e91384c6b183e1a9feb05806185