Merge branch 'modulo-painel'

Conflicts:
assets/css/framework.css
assets/css/framework.min.css
src/sass/framework.scss