Vaadin7 migration
Vaadin7 migration almost complete