Vaadin 7

Change-Id: I49632bbfcfc77f7b47e125e96bd2e11997801e50