renamed User to users, Group -> Groups
Merge branch 'master' of github.com:osiam/server