line removed
Step 2 finished
Merge branch 'master' into Step_2
repairing master branch
Merge branch 'Step_2'

Conflicts:
	src/main/java/de/gebit/training/vaadin/demo/VaadinDemoUI.java
merge repaired