adding desing to form of users/edit and users/new
Solving merge conflicts.
Merge branch 'development' of https://github.com/EscalaSaudeDF/TEM-DF into development