Merge pull request #6 from likunpeng06/master

角色管理
merge
merge
Merge pull request #19 from chirowong/master

20141223