Vaadin 7

Change-Id: Id774cad82cf03c128f95f30a39fee7ecbad70f91