Added Many to One / One to Many and Stundenplan
Conflict
Merge branch 'master' of https://github.com/CitySim/NSA-Stundenplan.git
Merge branch 'master' of https://github.com/CitySim/NSA-Stundenplan.git