Vaadin 7

Change-Id: I1c36d48379da841d56c2caed94e075ecac6261aa