Merge pull request #11 from qatang/dev

merge dev
fix part of bugs
fix
删除不必要的代码
Merge pull request #58 from JSHgithub/master

修改userController