Merge pull request #5 from peholmst/master

Update master from upstream/master
Merge branch 'master' of https://github.com/GJRTimmer/vaadin4spring