Fix ice tap
Merge branch 'NewMaster' of https://github.com/bhuberDADIU/DADIU-Team-2 into NewMaster
Merge branch 'NewMaster' of https://github.com/bhuberDADIU/DADIU-Team-2 into NewMaster
Added new QA buttons
Fixed
Merge branch 'NewMaster' into GUI