zwischenstand
zwischenstand
Merge branch 'origin/feature-cockpit'

Conflicts:
	cockpit/cockpitEdit.html
edit form fits now to new attributes structure