groups added
Merge branch 'master' into rogie
correction on schema for user ID