reset password by admin and change password by user
Merge remote-tracking branch 'origin/master'
all departments and touch points assigned to a user are showed in the update view page