Gui Punkte hinzugefügt
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.settings/com.vaadin.integration.eclipse.prefs