commit
chage to list of user groups
fixed conflict in service.js
Merge branch '0.1.1a' into 0.1.1a-eab