dataActivity layout cleaning
merge with tcuje
Small improvements
git ist doof
Merge branch 'div' in 'michael'
Merge branch 'dev' in 'michael'
Merge branch 'dev' in 'michael'
SpinnerHelper, Strings
Merge branch 'dev' in 'michael'
Merge branch 'dev' in 'michael'
handmerged michael into tcuje
merge2
Merge branch 'michael' into tcuje
minor fixes
Präsentation
deletebutton doubleTap fix
clear conflict
solve conflict