:Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
:Merge branch 'develop' of github.com:iurimatias/embark-framework into develop

iurimatias/embark-framework,iurimatias/embark-framework