[Bug 1010593] Add back option to merge groups in the admin
Merge branch 'BUG-1010593' of github.com:chromano/mozillians into BUG-1010593