Various fixes
Merge branch 'NewMaster' into RandomFixes
Merge branch 'NewMaster' of https://github.com/bhuberDADIU/DADIU-Team-2 into NewMaster