Merge remote-tracking branch 'cebitversion/kivitendo_style'