Rollenoperationen
Merge branch 'newbranch'

Conflicts:
	nbproject/private/private.xml