Implement User Group
working on category markup1
bug fix 1
Merge branch 'user-ingtegration2' into userbundle-update

Conflicts:
	app/Resources/views/base.html.twig
bug fix 2
bug fix 3
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
user group add1
user group add2
user group add3
user group add4
bug fix 6
bug fix 7
bug fix 8
bug fix 9
bug fix 10
bug fix 11