Merge pull request #4 from qatang/dev

merge
角色更新
Merge pull request #18 from zzqjava/master

更新20140610