Admin Interface

admin interface soweit alles angepasst
Merge branch 'master' into ange

Conflicts:
	Sopra/WebContent/modulLoeschen.xhtml
	Sopra/build/classes/META-INF/persistence.xml
	Sopra/src/META-INF/persistence.xml