Vaadin 7

Change-Id: I59a3e724bbf4897d8f104eb0315907fa85978906