User form
Adding alert on saving a user
Fixing conflits for users.js and .tpl
Solving conflicts again.