Fixed most issues. Group management should work fine now.
Merge remote-tracking branch 'origin/master'