add list of users to joinActivity
add list of users to joinActivity //not done
merge conflict
merge conflict
no nmore override byId in TypeRepository
working on joinActivity
Merge branch 'master' of https://github.com/OT-SIMS-2013/server.git