Added local_groups resource
Fix conflicts
Merge branch 'local_groups'