merge
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
add the user manage
Merge pull request #16 from lucknessbuaa/master

add the user manage