Step 3 in work
Merge branch 'master' of
https://sboehm85@github.com/sboehm85/vaadin-demo.git

Conflicts:
	src/main/java/de/gebit/training/vaadin/demo/EditView.java