pdf und rechteverwaltung
Merge branch 'master' into Innas-Pdf-Anbindung

Conflicts:
	Sopra/.classpath
	Sopra/WebContent/resources/css/styleHauptfensterInhalt.css
	Sopra/build/classes/META-INF/persistence.xml
	Sopra/src/META-INF/persistence.xml