Add admin groups and shares controller
Fix merge conflicts