Admin groups view fix.
Merge branch 'dev'