new user edit
Merge pull request #1 from XandyWang/master

new user edit