made a basic validation for the join group feature
Merge branches 'master' and 'dev'