UI update
Merge branch 'master' of https://github.com/ATnCOJunior/development

Conflicts:
app/web/login.html
ui