Merge pull request #5 from JSHgithub/master

初步完善用户管理
init
Merge pull request #2 from qatang/master

merge dev