Vaadin 7

Change-Id: Idb85c7f93966d288fcc141dc36a466bc81987b6b
Doco

Change-Id: I09e393060735295265c9a5d12cf0cd7fc76cb280