refactoring
Merge remote-tracking branch 'mpetris/vaadin7' into vaadin7