Fix add new person in group member page
Fix conflicts after merging MH-514 to dev