Base
Merge branch 'master' of github.com:haukka/Vaadin_proj2