Merge branch 'master' of https://github.com/jocelio/core.git

Conflicts:
	Ivy/WebContent/crud-mercadorias.xhtml
Configuração do OneToMany com filto do toMany com apenas registros
ativos.
Merge branch 'master' of https://github.com/jocelio/core.git