Ajuste de conflito
Merge branch 'master' of https://github.com/kaplen/KaplenAdmin.git