#BS-3 fixed
Merge branch 'master' of https://github.com/therealstan/DHBW_SE