Collapse angefangen
Merge branch 'master' of https://github.com/TeamProjektWS1415/TeamProjekt