Vaadin 7

Change-Id: I6b924426a965ead5cbb9cd7f9fcc1d3a7a68fa69