Merge pull request #14 from mpetris/vaadin7

Vaadin7