modulAendern angepasst
Merge branch 'ange'

Conflicts:
	Sopra/WebContent/modulAendern1.xhtml
Merge branch 'master' of https://github.com/Merglasch/4142Sopra