Rolle zu User zuweisen
Merge branch 'zeybranch'

Conflicts:
	nbproject/private/private.xml
	web/admin/roles2.jsp