Add groups and users
Merge remote-tracking branch 'origin/master'