update
Merge branch 'master' of github.com:mooing/wss
update user role module