Little changes for user and admin
Merge branch 'master' of https://github.com/wenhanwu/525hw01.git