user management jsp
Merge origin/master
user.jsp
user.js

->to fix