Merge pull request #8 from likunpeng06/master

角色管理更改
分配资源
500
Merge pull request #20 from chirowong/master

20141224