[IMP] res.users: improved form view to ease email, login and email preferences clarification
[MERGE] Sync with trunk
[MERGE] [IMP] Alias Improvement

Server branch: res.users: improved form view to ease email, login and email preferences clarification.