modify user form
Merge branch 'dev'