Merge pull request #8 from qatang/dev

merge dev
fix bugs
fix userList.jsp
Merge pull request #46 from JSHgithub/master

a new pull request