ticket 1321323
Merge branch 'master' of https://github.com/inovexAcademy/ATeam