Vaadin 7

Change-Id: I91c2a3380c226f50d06a6c27b03fae038dc69661