Correções
Merge branch 'master' of https://github.com/mksdev/framework

Conflicts:

layout/src/main/resources/META-INF/resources/template/defaultPrivate.xht
ml