Vaadin 7

Change-Id: Idd64e501b1dd57f1f63e8dacb469a10fc08064e0