neue datei
noch was neues
Merge branch 'dev-new'

some changes, fix some issues, delete branch after that merge