First working Vaadin integration servlet way.
Merge remote-tracking branch 'origin/master'