#BS-5 In progress

#BS-11 Fixed
#BS-12 To be discussed
Merge branch 'master' of https://github.com/therealstan/DHBW_SE