Vaadin 7

Change-Id: I521a32fca15b5318a0a92661c20a08f441ab63b5