baumstruktur
Merge branch 'master' into inna_ka

Conflicts:
	Sopra/MyDB/log/log.ctrl
	Sopra/MyDB/log/log1.dat
	Sopra/MyDB/log/logmirror.ctrl
	Sopra/MyDB/seg0/c980.dat
	Sopra/MyDB/seg0/c991.dat
	Sopra/MyDB/seg0/c9a1.dat
	Sopra/WebContent/modulLoeschen.xhtml
	Sopra/src/model/ModulAendernBean.java
	Sopra/src/model/ModulErstellenBean.java
Merge branch 'master' of https://github.com/Merglasch/4142Sopra

Conflicts:
	Sopra/src/model/ModulAendernBean.java