Implement User Group
Merge branch 'user-ingtegration2' into userbundle-update

Conflicts:
	app/Resources/views/base.html.twig
Merge remote-tracking branch 'origin/userbundle-update'

Conflicts:
	app/Resources/views/base.html.twig
added missing  files
Merge remote-tracking branch 'origin/userbundle-update'
user group add