commit
chage to list of user groups
fixed conflict in service.js