First commit.
Merge branch 'master' of https://github.com/cobusbernard/JEE6Vaadin

Changing the author to the correct one.