Resolulão de conflitos
Merge branch '2.4.0' of github.com:demoiselle/framework into 2.4.0