user_group_bean
Merge remote-tracking branch 'origin/master'

Conflicts:
	ejb/META-INF/ejb-jar.xml
	web/web/WEB-INF/web.xml