Vaadin 7

Change-Id: Ie59e63b9fe5646d502666e07939bc4796fb298d2