Upgrade vaadin sample to version 2.0.M2