persistance xml edit
Merge branch 'master' of https://github.com/supergonteta/swp-prototyp.git
entity added
timeslot edit
Merge branch 'master' of
https://github.com/supergonteta/swp-prototyp.git

Conflicts:
	stundenplan.git/src/main/java/de/unibremen/swp/stundenplan/data/Subject.java