jsps: edit, delete, add user, list of users (test)
Merge remote-tracking branch 'origin/master'